Commit graph

927 commits

Author SHA1 Message Date
randx 6ff0652e9e Admin area -> user form 2012-08-25 20:31:19 +03:00
randx fee26c58e2 Move snippets api doc to separate file 2012-08-25 19:21:11 +03:00
Florian Unglaub 48443d20ca Merge branch 'master' of git://github.com/gitlabhq/gitlabhq 2012-08-24 15:25:52 +02:00
Joe Hillenbrand 0dbde913dc Hide gravatar tip if gravatar is disabled. 2012-08-24 16:04:07 -07:00
randx 3dd7703b80 Feature: Labels page. Index page 2012-08-24 13:05:40 +03:00
Cyril e2f19befbc fix inline forms 2012-08-23 23:04:43 +02:00
Dmitriy Zaporozhets 0e5dbd1caf Merge pull request #1231 from NARKOZ/preview_notes
Preview window is not closed after post
2012-08-23 06:56:55 -07:00
Dmitriy Zaporozhets aa50408ecb 1. Better message if no ssh key
2. SSH Keys Help page
2012-08-22 03:56:53 +03:00
randx f088eaa972 Refactoring & minor css changes 2012-08-21 21:26:56 +03:00
randx c625293b99 Handle post-receive files via gitolite, not gitlab 2012-08-21 20:14:06 +03:00
Dmitriy Zaporozhets 2e7ca8c866 Show only tm events related to this project 2012-08-21 08:20:11 +03:00
randx b2b88b2ff2 Added font for head panel. Major restyle for header 2012-08-20 22:51:37 +03:00
randx 8eaead6a01 Text message for mergeing MR 2012-08-19 00:45:46 +03:00
randx 3f9749dd86 Fix branch selector. Few css fixed also 2012-08-18 23:53:58 +03:00
Florian Unglaub a64aff2f1c Omniauth Support 2012-08-17 15:20:55 +02:00
Dmitriy Zaporozhets 93401ef988 Few css improvements 2012-08-17 09:26:59 +03:00
Dmitriy Zaporozhets 4ce034ca65 Merge pull request #1247 from tsigo/feature/no_milestone_filter
Allow filtering issues that have no milestone or assignee
2012-08-16 22:33:56 -07:00
Robert Speicher feee3838e1 Combine unassigned_issue and unassigned_milestone into unassigned_filter 2012-08-16 18:13:22 -04:00
Robert Speicher 66399d558d Merge branch 'master' into hooray_apostrophes 2012-08-16 14:03:06 -04:00
Dmitriy Zaporozhets 05da3801f5 Restyled erros pages & avatar class 2012-08-16 09:13:50 +03:00
Martin Bastien 6641761e5c Fix current class for hooks tab in admin section
Signed-off-by: Martin Bastien <martin.bastien@studiofrenetic.com>
2012-08-15 00:03:13 -04:00
Robert Speicher 70174a1e1a More minor translation/grammar fixes on error pages 2012-08-14 17:26:38 -04:00
Nihad Abbasov 0b7e67ad12 fix note preview link, and hide preview and errors after posting a comment 2012-08-14 01:24:27 -07:00
Robert Speicher 6af38f5145 "Cant" -> "Can't" 2012-08-13 21:02:40 -04:00
Robert Speicher 5a90d044f7 Allow filtering by issues with no assigned... assignee
Continues #1222
2012-08-13 20:49:18 -04:00
Dmitriy Zaporozhets 6ebd360cf2 Modern theme restyled. Better Profile -> Ui page 2012-08-13 08:52:10 +03:00
Robert Speicher b1ea0b3c01 Allow filtering by issues with no assigned milestone
Closes #1222
2012-08-13 01:38:00 -04:00
randx bd0c971aa9 Merge branch 'fix_commits_dashboard' of https://github.com/jouve/gitlabhq into jouve-fix_commits_dashboard
Conflicts:
	app/views/events/_commit.html.haml
2012-08-12 00:33:32 +03:00
Robert Speicher 7754189187 Fully embrace Ruby 1.9 hash syntax
Didn't bother with files in db/, config/, or features/
2012-08-10 18:25:15 -04:00
Cyril 15fc0f0c10 fix commit events on dashboard 2012-08-10 21:23:54 +02:00
Dmitriy Zaporozhets 5fd0e7ba11 Merge pull request #1198 from NARKOZ/preview_notes
ability to preview notes
2012-08-10 06:42:31 -07:00
Nihad Abbasov 9639780359 render notes preview on server-side 2012-08-09 23:47:48 -07:00
randx f197fa1fbf Fix github issue #1153 2012-08-08 17:08:43 +03:00
Dmitriy Zaporozhets 839757598b Wiki pages page 2012-08-09 07:34:29 +03:00
Dmitriy Zaporozhets 8ffb6126a9 slim comment form 2012-08-09 06:36:55 +03:00
Nihad Abbasov 1ec3bd3f8d ability to preview notes 2012-08-08 01:12:05 -07:00
randx 6171a4d8eb Fixed dashboard broken messages cause of glm 2012-08-03 03:28:02 +03:00
randx 34ba4e1352 Gitlab Markdown help page 2012-08-03 00:20:09 +03:00
Riyad Preukschas 5443021a0e Update notifications mails and notify specs for GFM 2012-08-06 05:08:22 +02:00
Riyad Preukschas 9a0b763eec Fix missing @project errors 2012-08-06 03:16:06 +02:00
Riyad Preukschas 8e6a7a172e Merge branch 'master' into gitlab-flavored-markdown 2012-08-06 01:48:20 +02:00
Valeriy Sizov 3079687b93 Merge pull request #1179 from robbytaylor/master
Grammar fix after creating a project
2012-08-02 09:27:10 -07:00
Riyad Preukschas eb06dd79f8 Update views for GFM 2012-08-02 02:54:57 +02:00
Rob Taylor 516a76c9a9 Fixed grammar in 'please wait' message after creating project 2012-08-01 11:19:20 +01:00
randx e8261313a7 Fixed firefox css bug with issues table 2012-07-28 05:43:34 +03:00
randx 00b280c3f9 Feature: Bulk Issues update 2012-07-28 03:35:43 +03:00
randx 69e41250d1 Styled New/Edit Project for admin area 2012-07-28 00:42:44 +03:00
randx c2817e6f3a Team Member Profile: Remove button rebased 2012-07-29 01:40:21 +03:00
randx 4c1267e09f CSS refactoring. Notes better styled 2012-07-29 01:34:51 +03:00
Dmitriy Zaporozhets 354d243878 Merge pull request #983 from JamesEarlDouglas/notify-grammar
cleanup the wording of the notification footer
2012-07-28 07:38:17 -07:00
randx bc7897180d Better visibility of event commit links & commits ids 2012-07-28 00:27:54 +03:00
Dmitriy Zaporozhets f69049c282 Merge pull request #1144 from riyad/break-up-links-with-nested-formating-rebased
Break up links with nested formating (rebased)
2012-07-27 13:48:05 -07:00
randx 0590aa9d60 commit.short_id as model method. Styled inline comment form 2012-07-27 11:22:05 +03:00
randx 18f83016b1 Fixed persmission issue in doc. Added validation of hooks in gitlab:app:status 2012-07-26 16:14:34 +03:00
randx c27105f8c3 Fixed dashboard loader, fixed 404 for reporter on empty wiki page.
Styled Wiki edit page
2012-07-26 14:45:17 +03:00
Riyad Preukschas f6a67ef207 Update links in events 2012-07-25 22:27:25 +03:00
Riyad Preukschas 0aee7c94d0 Update links to milestones 2012-07-25 21:11:58 +02:00
Riyad Preukschas e6bb4f1491 Update links to merge requests 2012-07-25 21:11:58 +02:00
Riyad Preukschas 73dabcb357 Update links to issues 2012-07-25 21:11:58 +02:00
Riyad Preukschas cbce4528d0 Update links to commits 2012-07-25 21:11:58 +02:00
randx 14c9723724 Styled wiki area. fixed commit feed feature 2012-07-25 22:08:47 +03:00
randx 501ca8e6e8 Fix compare crash after decorator refactoring 2012-07-25 21:45:53 +03:00
randx 61c85332d2 Merge branch 'add_wiki_comments' of git://github.com/seeingidog/gitlabhq into seeingidog-add_wiki_comments
Conflicts:
	app/controllers/admin/mailer_controller.rb
	app/controllers/notes_controller.rb
2012-07-25 21:36:30 +03:00
Dmitriy Zaporozhets 5133541f25 Merge pull request #1127 from riyad/use-decorators
Use CommitDecorator more
2012-07-25 11:25:55 -07:00
Dmitriy Zaporozhets 05848512bf Merge pull request #1133 from robbytaylor/master
Updated merge request subheading.
2012-07-25 11:22:03 -07:00
Nihad Abbasov fbb41100db update help section with issues API docs 2012-07-24 05:52:43 -07:00
Rob Taylor dce6f7beb4 Updated merge request subheading.
Changed "authored or assigned to you" to read "authored by or assigned to you" which reads better.
2012-07-24 11:22:13 +01:00
Riyad Preukschas 34cea1cb63 Update views to use CommitDecorator 2012-07-22 13:08:24 +02:00
randx 11721b0dbe Help section for system hooks completed 2012-07-21 10:47:57 +03:00
randx 9c8a1e6517 Fix system hook example 2012-07-21 10:32:42 +03:00
randx 4261acda90 move SSH keys tab closer to begining 2012-07-21 10:27:09 +03:00
randx a69fc5dd23 Endless event loading for dsahboard 2012-07-21 10:23:05 +03:00
Pat Thoyts 787e5e94ac Fix english on the edit user form.
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-07-20 22:18:42 +01:00
Dmitriy Zaporozhets 3c6daec4b1 Merge branch 'sys_hooks' of dev.gitlabhq.com:gitlabhq 2012-07-20 09:08:16 +00:00
Ian Morgan 36efa2042c Add comments to Wiki pages 2012-07-19 20:23:55 -04:00
gliptak 44ec5579bd Display configured git repository location on error page (this is partially addressing issue #1072) 2012-07-19 12:39:02 -03:00
Dmitriy Zaporozhets 1464952597 Fix comments in MR. Fixed event destroy with user 2012-07-19 07:05:57 +03:00
Valeriy Sizov c38578428b System Hooks: CRUD has done 2012-07-19 00:25:10 +03:00
Dmitriy Zaporozhets 494cd02b38 Colored labels for events on dashboard 2012-07-17 08:21:16 +03:00
Dmitriy Zaporozhets a3bb9ca1fa Feature: Unassigned Merge Requests 2012-07-17 08:19:16 +03:00
Dmitriy Zaporozhets 80f2ef2d02 MR index pollished 2012-07-17 08:17:16 +03:00
Dmitriy Zaporozhets 2a705c4f40 Admin logs improved. Commits list box styled 2012-07-16 08:03:10 +03:00
Dmitriy Zaporozhets f88a2617e6 Tree ajax log. progress bar & refactoring 2012-07-10 23:12:38 +03:00
randx 1a2bacfb4b Feature: ajax load for tree commit log 2012-07-10 22:52:38 +03:00
randx b8425cf173 Last push widget improved 2012-07-10 21:26:41 +03:00
randx d3862c0e57 CSS improvements & refactoring 2012-07-10 20:16:23 +03:00
Dmitriy Zaporozhets 1dca367f22 Merge pull request #1067 from SaitoWu/bugfix/encoding
fix blame encoding error.
2012-07-10 01:08:31 -07:00
Saito c5b16f0998 fix blame encoding error. 2012-07-10 15:57:43 +08:00
Staicu Ionut ba7b85d0d9 issues counter are now live updated on creation/deleteion/reopening
buttons on forms are disabled on submit (re-enabled after the request is complete)
2012-07-10 07:33:04 +03:00
randx be1b40802d Api page in help 2012-07-06 03:05:12 +03:00
randx 6451e837bf Better event feed for dashboard 2012-07-06 02:16:41 +03:00
Dmitriy Zaporozhets 4c24cabf47 Merge pull request #1012 from NARKOZ/devise
Add 10 minutes lock after 10 failed login attempts (Devise :lockable)
2012-07-06 08:18:18 -07:00
Nihad Abbasov 2abd054b0c update devise 2012-07-05 23:50:24 -07:00
Dmitriy Zaporozhets 9497b1a76e Compare images 2012-07-05 23:19:37 +03:00
Dmitriy Zaporozhets 31bc2b9495 Fix tree css class conflict 2012-07-06 16:42:13 +03:00
Dmitriy Zaporozhets 0a6b64e6a9 MR: Handle broken diff ex. in case its too huge 2012-07-05 22:59:37 +03:00
Dmitriy Zaporozhets d40b9ce26d Admin gitolite logs. Refactored project creation. Few style fixes. 2012-07-05 21:59:37 +03:00
Dmitriy Zaporozhets df6a75d52d buttons margin fixed 2012-07-05 09:35:23 +03:00
randx 264ee0c5a1 Tabs styled. MR Get Patch 2012-07-05 01:26:23 +03:00
Dmitriy Zaporozhets 031ae7756e Refactored navigation 2012-07-03 20:52:48 +03:00
Dmitriy Zaporozhets a2eda66b30 Disable issues sort. Recent issues on top. Fixed tests 2012-07-02 21:51:48 +03:00
Dmitriy Zaporozhets 9b337b8328 Epic: Gitlab configuration with default values 2012-07-02 21:51:48 +03:00
Dmitriy Zaporozhets b3a0ee8e63 Fix MR tab width 2012-07-02 12:15:23 +03:00
randx 6a58deb536 UI changes:
* .page_title  class added. Used for better page headers
* improved help page
* added back links for help pages
* show app version & revision on help page

Backend changes:
* Gitab::Version && Gitlab::Revision constants
2012-07-01 00:35:24 +03:00
James Earl Douglas cc7369305c cleanup the wording of the notification footer 2012-06-29 12:52:38 -07:00
randx 2def1c7217 Merge Request -> show. Refactored. f5 support for diff 2012-06-29 21:55:22 +03:00
gleb 2da45e9cbf Refs #1013
Renamed protect_resque.rb => resque_authentication
Integrated resque web with the rest of gitlab
2012-06-29 13:46:24 +02:00
randx 335f9d6410 New Feature: Diff patch file export for commit 2012-06-28 12:51:50 +03:00
randx 5f356d6928 Issues tags: refactoring 2012-06-27 23:13:44 +03:00
Dmitriy Zaporozhets 50fdb2e7df Remove critical status from Issue. Move sort instead 2012-06-27 21:30:35 +03:00
Dmitriy Zaporozhets 1b1e77c728 Issue Labels: Edit, show, index + filter 2012-06-27 21:20:35 +03:00
Dmitriy Zaporozhets 4c1f435ab7 Merge pull request #971 from gingko/master
Automatic password creation..
2012-06-26 23:41:49 -07:00
Jakub Troszok 5ab1856291 Fixing requests tests. 2012-06-27 00:55:54 +02:00
Jakub Troszok 4426bc1844 Added option to automaticaly generate passwords for new users. 2012-06-26 23:59:08 +02:00
randx 1c8008c154 Informative search results page 2012-06-27 00:05:47 +03:00
randx 385ca60a6a issues_table css class 2012-06-26 23:34:23 +03:00
randx cbca0457f8 Issues list more compact now 2012-06-26 22:23:49 +03:00
randx 88c625e3f7 Issues can be unassigned now 2012-06-26 21:47:25 +03:00
randx 283bf80676 Comment icons for Issues, MR lists 2012-06-26 21:20:05 +03:00
randx 0321a3c9b4 MR: merged badge. Removed colors from MR list 2012-06-26 19:08:44 +03:00
Valeriy Sizov 1e1c5b7afe Diff refactoring 2012-06-24 01:14:45 +03:00
randx b32465712b Up to 2.6 2012-06-21 20:25:23 +03:00
randx 1903f6ade0 admin area -> search for users 2012-06-21 19:05:09 +03:00
randx 98a45ce6ee admin area -> search for projecs 2012-06-21 18:54:57 +03:00
randx 77cf662034 Pushed widget improved 2012-06-21 18:41:22 +03:00
randx 2d16585eae Few minor css improvements 2012-06-21 17:23:25 +03:00
Dmitriy Zaporozhets 75cf927d3b Issues & MR legend 2012-06-21 08:29:53 +03:00
Zevs 5fd2f7158e remove double negative 2012-06-21 00:21:13 +03:00
randx 1a05f2f7c9 Get rid of deprecated link_to_function 2012-06-20 21:29:55 +03:00
Zevs 6507c1085e Revert "Handle Commit "show suppressed diff" link with a doc-ready event handler."
This reverts commit ef1598b4af.
2012-06-20 21:01:27 +03:00
Zevs a9c7de8815 Revert "Handle MR "show all commits" link with a doc-ready event handler."
This reverts commit 5b1ede6280.
2012-06-20 21:01:00 +03:00
Zevs 581a822326 Revert "Invert "unless .empty?" to "if .present?"; unless-else is evil."
This reverts commit 7484bcfff7.
2012-06-20 21:00:34 +03:00
Valeriy Sizov 65c35394eb Merge pull request #951 from robbkidd/remove_link_to_function
Replace calls to deprecated link_to_function with doc-ready functions.
2012-06-20 10:43:32 -07:00
randx 4ac0160a11 Hande error with huge commits 2012-06-20 20:08:18 +03:00
Wouter D'Haeseleer c3d1f2eb9b make a hyperlink from the counted keys
Refs Ticket #948
2012-06-20 17:16:56 +02:00
Robb Kidd ef1598b4af Handle Commit "show suppressed diff" link with a doc-ready event handler.
Replaces link_to_function use which was deprecated in Rails v3.2.4.
https://github.com/rails/rails/commit/9dc57fe9c

Still absent is a graceful degrade for no-JS.
2012-06-20 11:11:17 -04:00
Valeriy Sizov e27a1d31e0 Merge pull request #937 from jdamick/master
Modified the login screen for primarily LDAP authentication
2012-06-19 01:40:01 -07:00
Robb Kidd 5b1ede6280 Handle MR "show all commits" link with a doc-ready event handler.
Replaces link_to_function use which was deprecated in Rails v3.2.4.
https://github.com/rails/rails/commit/9dc57fe9c

Still absent is a graceful degrade for no-JS.
2012-06-18 18:36:25 -04:00
Robb Kidd 7484bcfff7 Invert "unless .empty?" to "if .present?"; unless-else is evil. 2012-06-18 18:32:46 -04:00
randx 034ddb85fe Assignee filter for issues 2012-06-18 20:50:06 +03:00
randx 22d6dc2b3b Cucumber features: Team, SSH keys 2012-06-18 19:34:09 +03:00
jdamick 9a4e5a8bd5 removed dead code from the form 2012-06-18 11:51:17 -04:00
jdamick 848b5e99fc moved the ldap login to its own partial and cleaned up the forms a little bit 2012-06-18 11:45:49 -04:00
jdamick 50dabb5452 customizing the user login screen for primarily ldap authentication 2012-06-18 11:45:49 -04:00
Dmitriy Zaporozhets dbc7ef21d1 Merge pull request #932 from gitlabhq/cucumber
Cucumber
2012-06-16 03:46:14 -07:00
randx 781fd1a80c Cucumber -> Dashboard features 2012-06-16 12:50:14 +03:00
Gosha Arinich 482f1a7d19 Add HTML anchors for comments #929 2012-06-15 18:53:00 +03:00
Ben Phelps 6ff99fe945 Change "in" to "ago" in last edited message. 2012-06-14 20:51:01 -05:00
randx 36e88b960a CSS refactoring 2012-06-13 20:02:30 +03:00
Dmitriy Zaporozhets a243253b10 Refactored project archive. Improved MR usability form 2012-06-13 09:03:53 +03:00