summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add tests and changelog item for language graphslanguages-graphDmitriy Zaporozhets2015-12-083-0/+15
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Implement languages graph pageDmitriy Zaporozhets2015-12-084-0/+55
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'fix-random-test' into 'master' Dmitriy Zaporozhets2015-12-083-4/+16
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Fix random failing test - delete attachment Make sure we wait for AJAX request to finish before end test and cleanup database Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @rspeicher @DouweM Fixes #3885 See merge request !2007
| * Fix random failing test - delete attachmentfix-random-testDmitriy Zaporozhets2015-12-073-4/+16
|/ | | | | | | Make sure we wait for AJAX request to finish before end test and cleanup database Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'rs-spec-failure' into 'master' Robert Speicher2015-12-071-1/+1
|\ | | | | | | | | Fix spec failure introduced by 9d03bc6fa31f123e070bab4a58b67dbb008e75e9 See merge request !2006
| * Fix spec failure introduced by 9d03bc6fa31f123e070bab4a58b67dbb008e75e9Robert Speicher2015-12-071-1/+1
| |
* | Merge branch 'fix-random-failing-test' into 'master' Dmitriy Zaporozhets2015-12-072-2/+8
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | Fix random failing test Make sure we wait till page reloads after request was merged. Otherwise we get request running which fails next test Improvement for !1897 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !2004
| * Fix random failing testDmitriy Zaporozhets2015-12-072-2/+8
| | | | | | | | | | | | | | Make sure we wait till page reloads after request was merged. Otherwise we get request running which fails next test Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'pberndt:master' into 'master' Robert Speicher2015-12-071-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #3758: Serious performance issues due to timeago() being called n*(n+1)/2 times instead of n See bug #3758 for a description. This merge request alters `time_ago_with_tooltip` to invoke the `timeago()` javascript on the current timestamp only, instead of each one defined on the page so far. See merge request !1977
| * | time_ago_with_tooltip javascript snippet: Don't reinitialize older elementsPhillip Berndt2015-12-031-1/+1
| | | | | | | | | | | | see bug #3758
* | | Merge branch 'fix-parallel-merge' into 'master' Dmitriy Zaporozhets2015-12-072-2/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dont use cached collection for Repository find_branch and find_tag methods Fix for #3816 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !2003
| * | | Dont use cached collection for Repository find_branch and find_tag methodsDmitriy Zaporozhets2015-12-072-2/+3
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'report-ssl-errors' of https://gitlab.com/stanhu/gitlab-ceDmitriy Zaporozhets2015-12-075-23/+29
|\ \ \ \
| * | | | Fix specStan Hu2015-12-041-3/+1
| | | | |
| * | | | Handle and report SSL errors in Web hook test. Check for status 200 for success.Stan Hu2015-12-044-20/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a Web hook test fails due to an SSL error or some other error, report the result back to the user instead of an Error 500. Closes #3656 Handle response
* | | | | Merge branch 'add_assign_to_me' into 'master' Dmitriy Zaporozhets2015-12-070-0/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter current user to top of assignee list in issues/merge requests ### What does this MR do? Fixes #2076 Filter the current user to the top of the assignee list in issues and merge requests. This makes it fast/easy for a user to assign themselves without compromising the UI. This is the same thing we do in the filter select boxes in other places. ### Are there points in the code the reviewer needs to double check? No. ### Why was this MR needed? Users requested the feature in #2076 See merge request !1493
| * | | | Filter current user to the top of issue assignee listDrew Blessing2015-12-031-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'fix-api-private-project-update' into 'master' Dmitriy Zaporozhets2015-12-073-2/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix API setting of 'public' attribute to false will make a project private There is a bug in the projects API where setting `public` to `false` of would not change `visibility_level` even if `visiblity_level` were not present. Closes #3864 See merge request !1996
| * | | | Fix API setting of 'public' attribute to false will make a project privateStan Hu2015-12-053-2/+19
| | | | | | | | | | | | | | | | | | | | Closes #3864
* | | | | Merge branch 'minimize-readme' into 'master' Dmitriy Zaporozhets2015-12-072-2/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move release cycle comments to the documentation. See merge request !1995
| * | | | | Move release cycle comments to the documentation.minimize-readmeSytse Sijbrandij2015-12-052-2/+6
| | | | | |
* | | | | | Merge branch 'feature/sidekiq-cron' into 'master' Dmitriy Zaporozhets2015-12-076-21/+49
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate from Sidetiq to Sidekiq-cron Migrate from Sidetiq to Sidekiq-cron Updated Sidekiq to 3.5.x This will solve #2355 See merge request !1982
| * | | | | Migrate from Sidetiq to Sidekiq-cronfeature/sidekiq-cronGabriel Mazetto2015-12-046-21/+49
| | | | | | | | | | | | | | | | | | | | | | | | Updated Sidekiq to 3.5.x
* | | | | | Merge branch 'fix-docker-syntax' into 'master' Kamil Trzciński2015-12-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Docker Syntax I think this documentation is using an out-of-date docker client. I guess that `-n` means `--name` (there is no `-n` in up-to-date docker) and `-l` means `--link` (`-l` is short for `--label` now). See merge request !2001
| * | | | | | Update Docker SyntaxMichael A. Smith2015-12-071-1/+1
|/ / / / / /
* | | | | | Merge branch 'webhook_payload_with_changes' into 'master' Valery Sizov2015-12-077-45/+58
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add added, modified and removed properties to commit object in webhook https://gitlab.com/gitlab-org/gitlab-ee/issues/20 See merge request !1988
| * | | | | | fixes after reviewwebhook_payload_with_changesValery Sizov2015-12-073-18/+11
| | | | | | |
| * | | | | | fox specsValery Sizov2015-12-074-17/+28
| | | | | | |
| * | | | | | Add added, modified and removed properties to commit object in webhookValery Sizov2015-12-046-42/+51
| | | | | | |
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqStan Hu2015-12-071-1/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #9892 from stetskevych/fix_nginx_ssl_configJacob Vosmaer2015-12-071-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix gitlab-ssl nginx config to work when multiple server_names are served over https
| | * | | | | | | Fix gitlab-ssl nginx config to work when multiple server_names are served ↵Vyacheslav Stetskevych2015-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | over https
* | | | | | | | | Merge branch 'gsmethells/gitlab-ce-sort-by-due-date'Douwe Maan2015-12-078-10/+48
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Satisfy RubocopDouwe Maan2015-12-071-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into gsmethells/gitlab-ce-sort-by-due-dategsmethells/gitlab-ce-sort-by-due-dateDouwe Maan2015-12-07201-1253/+2168
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| * | | | | | | | | sort milestones by due_dateGreg Smethells2015-12-038-11/+49
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix/award-emoji-conflict-in-notes' into 'master' Grzegorz Bizon2015-12-0711-43/+129
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix problems with award-emoji-only comment This fixes a conflict between note with only a single emoji in content and award-emojis mechanisms. Closes #3734 cc @vsizov See merge request !1936
| * | | | | | | | | Simplify `contains_emoji_only?` method in `Note`fix/award-emoji-conflict-in-notesGrzegorz Bizon2015-12-071-2/+1
| | | | | | | | | |
| * | | | | | | | | Remove space before exclamation mark in award alertGrzegorz Bizon2015-12-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | Refactor note awards to reuse `emoji_pattern` and improve validatorGrzegorz Bizon2015-12-051-18/+14
| | | | | | | | | |
| * | | | | | | | | Make method `supports_award?` public in `Note`Grzegorz Bizon2015-12-031-2/+2
| | | | | | | | | |
| * | | | | | | | | Combine new javascript Flash methods into oneGrzegorz Bizon2015-12-032-7/+3
| | | | | | | | | |
| * | | | | | | | | Support emoji awards also in merge requestsGrzegorz Bizon2015-12-031-3/+4
| | | | | | | | | |
| * | | | | | | | | Add feature test for emoji-only diff notesGrzegorz Bizon2015-12-032-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This specs is related to bug described in #3734 (award-emojis).
| * | | | | | | | | Pin flash message to top if award note is invalidGrzegorz Bizon2015-12-031-1/+3
| | | | | | | | | |
| * | | | | | | | | Add new features to javascript flash messageGrzegorz Bizon2015-12-032-6/+23
| | | | | | | | | |
| * | | | | | | | | Show flash message instead of alert when note is invalidGrzegorz Bizon2015-12-031-1/+2
| | | | | | | | | |
| * | | | | | | | | Add test for award-emoji being added as regular commentGrzegorz Bizon2015-12-032-13/+24
| | | | | | | | | |
| * | | | | | | | | Notify user when award-emoji comment is invalidGrzegorz Bizon2015-12-032-1/+10
| | | | | | | | | |
| * | | | | | | | | Render json message with errors if note didn't pass validationGrzegorz Bizon2015-12-031-10/+14
| | | | | | | | | |
View Lorry Controller Status