summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Version 8.5.1v8.5.1Rémy Coutable2016-02-241-1/+1
|
* Merge branch 'highlighted-note' into 'master'Jacob Schatz2016-02-248-9/+10
| | | | | | | | | | Changed padding & background color for highlighted notes Closes #12453 ![Screen_Shot_2016-02-23_at_11.18.59](/uploads/19150d884fd1175fe0df5f6daee64206/Screen_Shot_2016-02-23_at_11.18.59.png) See merge request !2937
* Merge branch 'fix-moving-revert-button' into 'master'Jacob Schatz2016-02-242-2/+3
| | | | | | | | | | | | | | Fixed revert button tooltip placement causing movement Before: ![moving-tooltip](/uploads/65cb9a41e8b8114fd8ee10d68cfd8206/moving-tooltip.gif) After: ![moving-tooltip](/uploads/a1c36eb5735dc7592c49f6b5cb1469b5/moving-tooltip.gif) See merge request !2910
* Merge branch 'bugfix/jschatz1/missing-project-button' into 'master'Rémy Coutable2016-02-244-9/+11
| | | | | | | | | | | | | | | | | Fix group projects styles Makes new project button visible when no projects are available. Fixes #13193 ![Screen_Shot_2016-02-04_at_1.08.27_PM](/uploads/36be9d5892506e7d1abcf4eb2a622e12/Screen_Shot_2016-02-04_at_1.08.27_PM.png) ![Screen_Shot_2016-02-04_at_1.07.48_PM](/uploads/fa257a1965017ff1274572dc66fccf90/Screen_Shot_2016-02-04_at_1.07.48_PM.png) ![Screen_Shot_2016-02-04_at_1.07.28_PM](/uploads/326f6fdac24b56e8408efd0d11dc2805/Screen_Shot_2016-02-04_at_1.07.28_PM.png) cc @creamzy @skyruler See merge request !2714
* Re-order CHANGELOG by merge request IDsRémy Coutable2016-02-241-6/+6
|
* Fix typo in CHANGELOGRémy Coutable2016-02-241-1/+1
|
* Merge branch 'issue-sidebar-content-scrolling' into 'master'Jacob Schatz2016-02-242-29/+25
| | | | | | | | Fixed issue with content in the issue sidebar disappearing Closes #13626 See merge request !2919
* Fix typo in CHANGELOGRémy Coutable2016-02-241-1/+1
|
* Merge branch 'bring-back-newrelic-gem' into 'master'Rémy Coutable2016-02-244-0/+21
| | | | | | | | | | | Revert "Remove newrelic gem. Closes #12860" This reverts commit 531767175f0a364a332c74bf27c5f202732ce519. Conflicts: Gemfile.lock See merge request !2943
* Merge branch 'hudecof/show-crowd-login-form-when-signin-disabled' into 'master'Robert Speicher2016-02-244-8/+15
| | | | | | | | Show Crowd login even when sign-in is disabled Fixes #13176. See merge request !2749
* Merge branch 'fix-todos' into 'master'Robert Speicher2016-02-244-34/+15
| | | | | | | | Does not raise an error when Todo is already marked as done Closes #13681 See merge request !2926
* Merge branch 'rs-update-raven' into 'master'Robert Speicher2016-02-243-3/+4
| | | | | | | | Update sentry-raven to 0.15.6 Fixes a few bugs, most notably (for our purposes): https://github.com/getsentry/raven-ruby/pull/450 See merge request !2947
* Merge branch 'dz-small-ui-fixes' into 'master'Jacob Schatz2016-02-2323-94/+111
| | | | | | | | | | | Set of UI fixes * Improve wiki pages * Improve profile pages cc @skyruler See merge request !2758
* Merge branch 'uploads-700' into 'master'Marin Jankovski2016-02-233-8/+11
| | | | | | | | Restrict permissions on public/uploads Based on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/631 See merge request !2764
* Merge branch 'milestone-drag-empty-list' into 'master'Jacob Schatz2016-02-232-9/+24
| | | | | | | | | | | | Issues can be dragged & dropped into empty milestone lists This is also possible with MRs. Also fixed an issue where MRs weren't sortable Fixes #13668 ![milestone](/uploads/aada0f48ce8b1407cce920eef3f4d5f3/milestone.gif) See merge request !2935
* Add 8.5.1 changes to CHANGELOGRémy Coutable2016-02-231-0/+5
|
* Merge branch 'fix/13631-error-with-merged-mr' into 'master' Rémy Coutable2016-02-232-1/+35
| | | | | | | | | Ensure we don't check a commit's description for revert message if it has no description Fixes #13631. /cc @razer6 @grzesiek @yorickpeterse @rdavila See merge request !2917
* Merge branch 'issue_13463' into 'master' Jacob Schatz2016-02-233-1/+10
| | | | | | | Fix Side-by-side view after loading diff results Fixes #13463 See merge request !2880
* Merge branch 'add_missing_doc' into 'master' Achilleas Pipinellis2016-02-232-0/+8
| | | | | | | Add when the API changes got introduced See merge request !2912
* Merge branch 'fix-failing-issue-tests' into 'master' Rémy Coutable2016-02-234-17/+7
| | | | | | | Fixed failing issues tests Also removed up/down vote icons from merge requests. Was missed from d8069bd85863ab8c47d2bb2370221b17fb686b93 See merge request !2911
* Remove "(unreleased)" from CHANGELOGRémy Coutable2016-02-221-1/+1
| | | | [ci skip]
* Version 8.5.0v8.5.0Rémy Coutable2016-02-221-1/+1
|
* Merge branch 'fix-zero-votes-showing-on-issue-list' into 'master' Rémy Coutable2016-02-222-11/+3
| | | | | | | | | Only show up or down votes icon on issue list if there are any Closes #13649 ![Screen_Shot_2016-02-22_at_10.20.27](/uploads/21477426856dab9731bb110032025867/Screen_Shot_2016-02-22_at_10.20.27.png) See merge request !2909
* Version 8.5.0-rc4v8.5.0-rc4Rémy Coutable2016-02-221-1/+1
|
* Merge branch 'tasks' into 'master' Douglas Barbosa Alexandre2016-02-2246-20/+1633
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Todos Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2425 Tasks: - Prepare database - [X] Create a new table (`todos`) - Tasks Queue view - [X] Add a number icon showing the number of todos on the top right next to the new and logout button that will redirect the user to the todos page - [X] Add a chronological list of todos, with the 'Todos' tab active by default - [X] Add a 'Done' button to each todo - [x] Add filters (project, author, type, and action) - Todos generation - [X] When user issue/mr is assgined to someone - [x] When user is mentioned on (issues/mr's/comments) - Mark todo as `done` - [X] When clicks on the 'Done' button - [X] When edit issue/mr - [X] When left/edit a comment - [X] When reassign issue/mr - [X] When add/remove labels to issue/mr - [X] When issue/mr is closed - [X] When mr is merged - [X] When added an emoji - [X] When changed the issue/mr milestone * Screenshot: ![Screenshot_2016-02-20_12.45.57](/uploads/4b2554b1bde25aed3347e1ae41e8e0c0/Screenshot_2016-02-20_12.45.57.png) See merge request !2817
* Merge branch 'merge-when-succeeded' into 'master' Douwe Maan2016-02-225-21/+87
| | | | | | | | | | | | | Fix bugs in MergeWhenSucceeded 1. This fixes support for merge when succeeded for statuses without ref. 2. This fixes support for merge when succeeded for multiple stages. Stages are created after all builds for previous one are finished. Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/9060 https://gitlab.com/gitlab-org/gitlab-ce/issues/8108 https://gitlab.com/gitlab-org/gitlab-ce/issues/12931 https://gitlab.com/gitlab-org/gitlab-ce/issues/13269 /cc @grzesiek @DouweM @rspeicher See merge request !2894
* Merge branch 'doc_artifacts_api' into 'master' Achilleas Pipinellis2016-02-211-11/+6
| | | | | | | | | | | | | Fix docs on artifacts API Small fixes for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2893 - Backticks in parameters - Remove headings - Fix curl URL link See merge request !2902
* Merge branch 'award-emoji-retina' into 'master' Jacob Schatz2016-02-213-0/+10
| | | | | | | | | | | | | | | | | | | | | Award emoji supports retina displays Based on discussion in !2800 There is now a retina spritesheet for emojis. It is 2mb, don't know how big an issue that is. Before: ![Screen_Shot_2016-02-19_at_11.07.25](/uploads/ea412579bcaddfd13fce67bf583de61b/Screen_Shot_2016-02-19_at_11.07.25.png) After: ![Screen_Shot_2016-02-19_at_11.07.36](/uploads/9d44c6278ba31987bad03dc1f46edd8b/Screen_Shot_2016-02-19_at_11.07.36.png) Also updated the rake task to make the @2x spritesheet https://gitlab.com/snippets/15348 cc\ @rspeicher @vsizov See merge request !2891
* Merge branch 'flush-cache-web-editor' into 'master' Douwe Maan2016-02-212-0/+18
| | | | | | | Flush emptiness caches whenever needed See merge request !2903
* Merge branch 'visibletrap/gitlab-ce-label'Douwe Maan2016-02-2118-19/+70
|
* Merge branch '12792-emoji-as-text-diff-comment'Douwe Maan2016-02-214-5/+15
|
* Merge branch 'builds-artifacts-API' into 'master' Kamil Trzciński2016-02-218-51/+162
| | | | | | | | | Introduce API for serving the artifacts archive Add API to download build artifacts archive in context of GitLab API /cc @DouweM @grzesiek See merge request !2893
* Merge branch 'doc/add-build-email-service' into 'master' Achilleas Pipinellis2016-02-194-4/+29
| | | | | | | Add documentation about build emails service Closes #12497 See merge request !2871
* Version 8.5.0-rc3v8.5.0-rc3Rémy Coutable2016-02-191-1/+1
|
* Merge branch 'issue_3276' into 'master' Jacob Schatz2016-02-1911-45/+223
| | | | | | | Labels should be visible in milestone view Closes #3276 See merge request !2599
* Merge branch 'commit-status-fix' into 'master' Kamil Trzciński2016-02-193-29/+33
| | | | | | | | | | | | | | | Fix missing ignored? for GenericCommitStatus This is pretty important fix. We should not release 8.5 without this. It critical error when handling GenericCommitStatus: ``` undefined method `ignored?' for #<GenericCommitStatus:0x007fe1a2a20fe0> ``` cc @grzesiek See merge request !2899
* Merge branch 'gitlab-ce-fix/revert-ruby-2.2' into 'master' Robert Speicher2016-02-197-42/+42
| | | | | | | | | | | revert back to ruby 2.1 - - - Revert Ruby 2.2 changes - until we solve https://gitlab.com/gitlab-org/gitlab-ce/issues/13514 This also updates Ruby 2.1.7 to 2.1.8 See merge request !2898
* Merge branch 'issue_3409' into 'master' Robert Speicher2016-02-1938-36/+629
| | | | | | | Add ability to revert changes introduced by Merge Requests or Commits Closes #3409 See merge request !1990
* Merge branch 'bugfix/jschatz1/issuable-consistency' into 'master' Rémy Coutable2016-02-191-1/+1
| | | | | | | | | Consistency in MR and issue header. Fixes: #13550 ![Screen_Shot_2016-02-18_at_11.20.19_AM](/uploads/8327ff045e45029b85b2cbac72c98a7f/Screen_Shot_2016-02-18_at_11.20.19_AM.png)![Screen_Shot_2016-02-18_at_11.20.55_AM](/uploads/f79613ebb23e4a62fb1bdb48d6f7fd2b/Screen_Shot_2016-02-18_at_11.20.55_AM.png) See merge request !2874
* Merge branch 'ci/remove-builds' into 'master' Grzegorz Bizon2016-02-1917-70/+385
| | | | | | | | | | | | | | | Make it possible to erase build content (artifacts, trace) This feature makes it possible to remove build content - build artifacts and build traces. - [x] Remove artifacts - [x] Remove metadata - [x] Remove build traces - [x] Wait for https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942 this to be merged - [x] Fix the permissions after the merge Closes #3421 See merge request !2560
* Merge branch 'axil/gitlab-ce-mention-project-in-fork-notice' into 'master' Rémy Coutable2016-02-191-1/+1
| | | | | | | | | | | Mention project name in fork notice _Originally opened at !1186 by @axil._ - - - I missed this one in !1070 See merge request !2897
* Merge branch 'saml-decoupling' into 'master'Patricio Cano2016-02-198-27/+402
|
* Merge branch 'ci/api-runners' into 'master' Kamil Trzciński2016-02-1914-26/+1008
| | | | | | | Add runners API References #4264 See merge request !2640
* Merge branch 'issue_11872' into 'master' Jacob Schatz2016-02-192-17/+13
| | | | | | | Put project visibility icon next to title Fixes #11872 See merge request !2885
* Merge branch 'web_editor' into 'master' Achilleas Pipinellis2016-02-1917-16/+110
| | | | | | | | | Update web editor documentation Based on https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/1045 Closes #4262 See merge request !2776
* Merge branch '12791-hide-project-limit-reached-warning' into 'master' Douwe Maan2016-02-192-1/+2
| | | | | | | Project limit is reached warning is hidden when the projects_limit is zero Fixes #12791 See merge request !2890
* Merge branch 'rs-emoji' into 'master' Douwe Maan2016-02-1913-3113/+20165
| | | | | | | | | Update Gemojione for new hotness :sparkles: Before | After ------ | ----- ![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png) See merge request !2800
* Merge branch 'fix/project-forks-page' into 'master' Douwe Maan2016-02-193-1/+14
| | | | | | | | | | | | | | | workaround for forks with an invalid repo Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13465 The error occurs when a project returns a `nil` commit for a variety of reasons, I assume the repository is corrupt - perhaps as a result of a failed fork. With this MR, we do not show forks with corrupted repos in the list of forks, as this does not seem to work anyway. A better solution is to fix the cause of the issue and/or any data integrity problem... Also fixing Sentry issue: 1180 `undefined method 'already_forked?' for nil:NilClass ` See merge request !2836
* Merge branch 'rs-show-owner-label' into 'master' Douwe Maan2016-02-192-9/+19
| | | | | | | Allow `ProjectTeam#human_max_access` to return "Owner" See merge request !2881
* Merge branch 'rs-sentry-release-tracking' into 'master' Douwe Maan2016-02-192-2/+3
| | | | | | | Add release tracking for Sentry See merge request !2863