summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Only show Edit button for text blobs.edit-in-patch-branchDouwe Maan2015-12-081-2/+2
|
* Show tooltip when trying to edit file when not on branchDouwe Maan2015-12-086-32/+41
|
* Default target branch to patch-n when editing file in protected branchDouwe Maan2015-12-085-7/+33
|
* Merge branch 'bump-gollum-version' into 'master' Valery Sizov2015-12-083-4/+5
|\ | | | | | | | | | | | | Bump gollum-lib to 4.1.0 and fix dependency mismatch with rouge Closes #3767 See merge request !2017
| * Bump gollum-lib to 4.1.0 and fix dependency mismatch with rougeStan Hu2015-12-083-4/+5
| | | | | | | | Closes #3767
* | Merge branch 'serve_lfs_object' into 'master' Douwe Maan2015-12-0815-18/+143
|\ \ | | | | | | | | | | | | | | | | | | Serve LFS object Depends on gitlab-org/gitlab_git!57 See merge request !1976
| * | All for you rubocop.Marin Jankovski2015-12-081-2/+2
| | |
| * | Stub the calls to disk and check what send_file returns.Marin Jankovski2015-12-081-1/+3
| | |
| * | Fix specs caused by update of gitlab-test repo.serve_lfs_objectMarin Jankovski2015-12-083-2/+4
| | |
| * | Rename blob helper, bump version of gitlab_git to 7.2.21.Marin Jankovski2015-12-074-7/+7
| | |
| * | Add specs for showing lfs object in UI.Marin Jankovski2015-12-0713-21/+111
| | |
| * | Recursivity needed if a fork is a fork of a fork.Marin Jankovski2015-12-042-2/+2
| | |
| * | Don't show diffs for lfs pointers.Marin Jankovski2015-12-042-4/+2
| | |
| * | Move the file serving to Raw controller, add a few ifs to view.Marin Jankovski2015-12-035-30/+36
| | |
| * | If a user clicks on the LFS object, it should be served if the user has ↵Marin Jankovski2015-12-032-0/+27
| | | | | | | | | | | | access to the object.
* | | Merge branch 'rs-validators' into 'master' Douwe Maan2015-12-0828-109/+231
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add more custom validators These custom validators allow us to DRY up our models a bit. See merge request !1944
| * | | Inline Gitlab::Blacklist in NamespaceValidatorrs-validatorsRobert Speicher2015-12-072-38/+32
| | | |
| * | | Add custom NamespaceNameValidatorRobert Speicher2015-12-072-3/+13
| | | |
| * | | Add custom NamespaceValidatorRobert Speicher2015-12-075-12/+46
| | | |
| * | | Add custom LineCodeValidatorRobert Speicher2015-12-073-2/+14
| | | |
| * | | Minor EmailValidator refactorRobert Speicher2015-12-071-7/+4
| | | |
| * | | Add custom ColorValidatorRobert Speicher2015-12-077-14/+47
| | | |
| * | | Move EmailValidator to app/validatorsRobert Speicher2015-12-071-0/+0
| | | |
| * | | Add custom UrlValidatorRobert Speicher2015-12-0710-37/+79
| | | |
* | | | Merge branch 'fix-merge-request-that-removes-submodule' into 'master' Douwe Maan2015-12-085-3/+48
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Fix 500 error when creating a merge request that removes a submodule Fixes #3476 See merge request !1989
| * | | Merge branch 'master' into fix-merge-request-that-removes-submodulefix-merge-request-that-removes-submoduleDouglas Barbosa Alexandre2015-12-0724-59/+133
| |\ \ \
| * \ \ \ Merge branch 'master' into fix-merge-request-that-removes-submoduleDouglas Barbosa Alexandre2015-12-0789-566/+1496
| |\ \ \ \
| * | | | | Fix 500 error when creating a merge request that removes a submoduleDouglas Barbosa Alexandre2015-12-045-3/+48
| | | | | |
* | | | | | Merge branch 'gemfile_fix' into 'master' Valery Sizov2015-12-082-1/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add explicit reference to rouge 1.10.1 We are relying on rouge 1.10.1 but nothing is referencing to this version and it is easy to lose this dependence. Previously, it was updated directly in Gemfile.lock which is not reliable way :) https://gitlab.com/gitlab-org/gitlab-ce/commit/e20529cec4f6de0c2c1589da99abb8714ea1c1c1 `gollum-lib` has a dependence `rouge 1.9` which is old for us. See merge request !1937
| * | | | | add explicit reference to rouge 1.10.1gemfile_fixValery Sizov2015-12-082-1/+3
|/ / / / /
* | | | | 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
View Lorry Controller Status