summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | Merge branch 'sort-text-removed-from-sort-dropdown' into 'master' Jacob Schatz2016-01-287-8/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed sorted text from dropdowns ![Screen_Shot_2016-01-28_at_09.04.36](/uploads/9e0e1fdb45ad12d122f860a2164d9396/Screen_Shot_2016-01-28_at_09.04.36.png) Closes #12796 cc @creamzy @jschatz1 See merge request !2635
| * | | | | | | | | | | | | | | | | | Removed sorted text from dropdownsPhil Hughes2016-01-287-8/+7
| |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #12796
* | | | | | | | | | | | | | | | | | Merge branch 'numbered-list-rendering-in-comments-cuts-off' into 'master' Dmitriy Zaporozhets2016-01-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes ol margin big enough for 3 digits. Fixes #7960 ![Screen_Shot_2016-01-25_at_11.20.03_PM](/uploads/73c4b9e939fe108fb3b8221e16e686bd/Screen_Shot_2016-01-25_at_11.20.03_PM.png) See merge request !2608
| * | | | | | | | | | | | | | | | | | Makes ol margin big enough for 3 digits.numbered-list-rendering-in-comments-cuts-offJacob Schatz2016-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #7960
* | | | | | | | | | | | | | | | | | | Merge branch 'feature/jschatz1/instant-issuable-history' into 'master' Dmitriy Zaporozhets2016-01-282-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds feature: Ajax Close/Open updates discussion automatically Triggers jQuery event <br/> Fixes #5544 See merge request !2610
| * | | | | | | | | | | | | | | | | | Adds comment about event listenerfeature/jschatz1/instant-issuable-historyJacob Schatz2016-01-261-0/+1
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Adds feature: Ajax Close/Open updates discussion automaticallyJacob Schatz2016-01-262-0/+3
| |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Triggers jQuery event Fixes #5544
* | | | | | | | | | | | | | | | | | Update gitlab-workhorse versions in documentationRobert Speicher2016-01-272-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | | | Update CHANGELOGRobert Speicher2016-01-271-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | | | Merge branch 'update-ruby-2.2.4' into 'master' Douwe Maan2016-01-2711-22/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Ruby version to 2.2.4 (latest previous stable) and update docs Tests and issues added to https://github.com/gitlabhq/gitlabhq/issues/8696 were all fine after the upgrade. Main issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/3340 See merge request !2534
| * | | | | | | | | | | | | | | | | | updated README to include Ruby 2.1James Lopez2016-01-271-1/+1
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | merge spec and spinach jobsJames Lopez2016-01-271-97/+4
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into update-ruby-2.2.4James Lopez2016-01-2798-452/+1134
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | update gitlab ci settings to include ruby 2.1 imagesJames Lopez2016-01-271-0/+116
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | updated docs to reflect min requirement of 2.1 [ci skip]James Lopez2016-01-272-2/+2
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | updated docs to reflect version update [ci skip]James Lopez2016-01-253-4/+3
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | fix rubocop new 2.2 syntax issuesJames Lopez2016-01-253-8/+8
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into update-ruby-2.2.4James Lopez2016-01-2587-804/+10965
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into update-ruby-2.2.4James Lopez2016-01-22168-834/+2997
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # .gitlab-ci.yml
| * | | | | | | | | | | | | | | | | | | update gitlab ci docker image versionJames Lopez2016-01-211-0/+1
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | update Ruby version to 2.2.4 (latest previous stable) and update docsJames Lopez2016-01-215-9/+9
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'events-performance' into 'master' Robert Speicher2016-01-279-41/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of retrieving last update times for events See 75195eefcca4cb3961986c90c8e837da02f30134 and https://gitlab.com/gitlab-org/gitlab-ce/issues/12415#note_3387317 for the juicy details. Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12415 See merge request !2613
| * | | | | | | | | | | | | | | | | | | | Use Atom update times of the first eventevents-performanceYorick Peterse2016-01-277-34/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By simply loading the first event from the already sorted set we save ourselves extra (slow) queries just to get the latest update timestamp. This removes the need for Event.latest_update_time and significantly reduces the time needed to build an Atom feed. Fixes gitlab-org/gitlab-ce#12415
| * | | | | | | | | | | | | | | | | | | | Don't pluck project IDs for eventsYorick Peterse2016-01-265-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By instead using a sub-query we save ourselves the overhead of loading any data into memory only to pass it on to another query.
* | | | | | | | | | | | | | | | | | | | | Merge branch 'rs-skip-2fa-on-signout' into 'master' Robert Speicher2016-01-272-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip the 2FA requirement during logout See merge request !2581
| * | | | | | | | | | | | | | | | | | | | | Update CHANGELOGRobert Speicher2016-01-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | | | | | | | Skip the 2FA requirement during logoutrs-skip-2fa-on-signoutRobert Speicher2016-01-231-0/+2
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'diff-colors' into 'master' Robert Speicher2016-01-275-8/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase contrast between highlighted code comments and inline diff marker. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12737. It was especially bad in Monokai, better now. See merge request !2629
| * | | | | | | | | | | | | | | | | | | | | | Increase contrast between highlighted code comments and inline diff marker.diff-colorsDouwe Maan2016-01-275-8/+9
| | |_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'fix-ci-runners-version-update' into 'master' Robert Speicher2016-01-277-6/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CI runner version not being properly updated when asked for a build Due to broken implementation of attribute_for_keys the runner information was not updated correctly. This MR adds test to check that such scenario will never happen again. See merge request !2618
| * | | | | | | | | | | | | | | | | | | | | | Fix CI runner version not being properly updated when asking for a buildfix-ci-runners-version-updateKamil Trzcinski2016-01-277-6/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to broken implementation of attribute_for_keys the runner information was not updated correctly. This MR adds test to check that such scenario will never happen again.
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fix/unexistent-group-500' into 'master' Robert Speicher2016-01-274-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return a 404 instead of a 500 when accessing a non-existent group Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3352 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/5600 See merge request !2614
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-01-2730-141/+472
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/unexistent-group-500
| * | | | | | | | | | | | | | | | | | | | | | | moved and refactored feature based on feedback. Also updated CHANGELOGJames Lopez2016-01-275-9/+9
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | update fix based on feedbackJames Lopez2016-01-271-2/+1
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | fix for failing specJames Lopez2016-01-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | feature and fix for 500 on group missingJames Lopez2016-01-263-0/+10
| | |_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs-require-jquery-ui' into 'master' Dmitriy Zaporozhets2016-01-271-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit jquery-ui requires to what we actually use See merge request !2274
| * | | | | | | | | | | | | | | | | | | | | | | Limit jquery-ui requires to what we actually users-require-jquery-uiRobert Speicher2016-01-251-1/+4
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit is a smoke test to run CI and see if we get back any JS errors.
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs-2fa-requirement-wording' into 'master' Dmitriy Zaporozhets2016-01-272-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update wording for 2FA requirement notice See merge request !2582
| * | | | | | | | | | | | | | | | | | | | | | Update wording for 2FA requirement noticers-2fa-requirement-wordingRobert Speicher2016-01-232-7/+7
| | |_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs-issue-12672' into 'master' Dmitriy Zaporozhets2016-01-271-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove link from system hook Closes #12672 See merge request !2588
| * | | | | | | | | | | | | | | | | | | | | | Remove link from system hookrs-issue-12672Robert Speicher2016-01-241-2/+1
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #12672
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs-bump-octokit' into 'master' Dmitriy Zaporozhets2016-01-272-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump octokit to `~> 3.8.0` Closes #2877 See merge request !2536
| * | | | | | | | | | | | | | | | | | | | | | Bump octokit to `~> 3.8.0`rs-bump-octokitRobert Speicher2016-01-212-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #2877
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'hot-reloading' into 'master' Douwe Maan2016-01-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix hot reloading for CI API See merge request !2617
| * | | | | | | | | | | | | | | | | | | | | | Fix hot reloading for CI APIhot-reloadingKamil Trzcinski2016-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'doc_forking_refactor' into 'master' Achilleas Pipinellis2016-01-276-18/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor forking workflow documentation Closes #5974 See merge request !2623
| * | | | | | | | | | | | | | | | | | | | | | Refactor the forking process and add new imagesAchilleas Pipinellis2016-01-276-13/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | | | | | | | | Conform to doc styleguide on max line lengthAchilleas Pipinellis2016-01-271-16/+24
| | | | | | | | | | | | | | | | | | | | | | |