summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Increase fixed layout width to 1280pxwider-layoutDmitriy Zaporozhets2015-12-111-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'ui-right-sidebar' into 'master' Dmitriy Zaporozhets2015-12-1120-298/+364
|\ | | | | | | | | | | | | | | | | | | Implement new sidebar for issue and merge request pages This is first step in implementing #3981. We don't have new dropdowns yet so I used some workarounds. Also I did it from linux machine without having access to design materials. So some colors/paddings might not match - but I will improve it with next iteration. cc @creamzy @JobV See merge request !2058
| * Fix testsDmitriy Zaporozhets2015-12-111-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Move awards back to gray panel and few improvements to sidebarDmitriy Zaporozhets2015-12-117-6/+7
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Few UI improvements to new sidebar implementationDmitriy Zaporozhets2015-12-113-8/+13
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Fix tests for new issuable sidebarDmitriy Zaporozhets2015-12-112-14/+30
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Update changelogDmitriy Zaporozhets2015-12-111-0/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Implement new sidebar for merge request pageDmitriy Zaporozhets2015-12-1110-92/+82
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Make edit link on issuable sidebar worksDmitriy Zaporozhets2015-12-111-2/+8
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Redesign issue page for new sidebarDmitriy Zaporozhets2015-12-116-198/+97
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Move awards css to separate fileDmitriy Zaporozhets2015-12-111-0/+68
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Implement issuable sidebar partialDmitriy Zaporozhets2015-12-111-0/+80
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'fix-typo' into 'master' Robert Speicher2015-12-111-1/+1
|\ \ | |/ |/| | | | | | | | | Fix typo [ci skip] See merge request !2035
| * Fix typoZeger-Jan van de Weg2015-12-101-1/+1
| |
* | Update CHANGELOGRobert Speicher2015-12-111-0/+1
| | | | | | | | [ci skip]
* | Merge branch 'mr-statuses' into 'master' Robert Speicher2015-12-116-1/+59
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display referenced merge request statuses in the issue description See gitlab-org/gitlab-ce#3180 for original issue. Previously discussed in !1941 and in !1771 before that. * [x] Show a "Related Merge Requests" list on the issue page under the Description as given by the UI mockup * [x] Display `all_references.merge_requests` and `note.all_references.merge_requests` * [x] Consider displaying the merge request status in addition to the CI status to enable complete merge request status understanding. See merge request !1991
| * | display referenced merge requests in issue description with CI statusgsmethells/gitlab-ce-mr-statusesGreg Smethells2015-12-116-1/+59
| | |
* | | Merge branch 'revert-2037' into 'master' Dmitriy Zaporozhets2015-12-114-2/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Revert removal of RedCloth Revert !2037. See merge request !2071
| * | | Revert "Merge branch 'remove-redcloth' into 'master' "revert-2037Douwe Maan2015-12-114-2/+6
| |/ / | | | | | | | | | | | | This reverts commit e426c027b0a2a3aa0dea1d833008f2bfd814f483, reversing changes made to c3676aa156981092b7f03f1a3e74bb819cfa2fc3.
* | | Merge branch 'fix-delete-notes-on-merge-request-diff' into 'master'Robert Speicher2015-12-114-8/+46
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | Fix delete notes on merge request diff Fixes #3971 See merge request !2061
| * | [ci skip] Update CHANGELOGfix-delete-notes-on-merge-request-diffDouglas Barbosa Alexandre2015-12-101-0/+1
| | |
| * | Remove note from MR discussion when deleting it in the changes tabDouglas Barbosa Alexandre2015-12-103-8/+45
| | |
* | | Merge branch 'feature/project_js_from_ee' into 'master' Douwe Maan2015-12-111-2/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Aling project js with EE The MR ports the changes introduced by gitlab-org/gitlab-ee!70 in `project.js.coffee`. See merge request !2054
| * | | Aling project js with EEBorja Aparicio2015-12-101-2/+5
| | | |
* | | | Merge branch 'complexity/rubocop-metrics' into 'master' Douwe Maan2015-12-1110-156/+368
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable rubocop metrics This enables rubocop metrics like CyclomaticComplexity and ABCSize. Initial threshold values are high, should be probably decreased. See merge request !1802
| * | | | Mix url helpers in into `RepositoryPush`Grzegorz Bizon2015-12-111-9/+10
| | | | |
| * | | | Bump cyclomatic and perceived complexity threshold by oneGrzegorz Bizon2015-12-081-2/+2
| | | | |
| * | | | Refactor CI YAML processor's validatorsGrzegorz Bizon2015-12-082-29/+43
| | | | |
| * | | | Check if commits are available in `RepositoryPush`Grzegorz Bizon2015-12-081-3/+3
| | | | |
| * | | | Duplicate options in `RepositoryPush`Grzegorz Bizon2015-12-081-4/+4
| | | | |
| * | | | Move `common_mentionable_setup` to shared context in specsGrzegorz Bizon2015-12-081-3/+3
| | | | |
| * | | | Add `RepositoryPush` specsGrzegorz Bizon2015-12-082-5/+127
| | | | |
| * | | | Fix specs by adding forgotten instance variableGrzegorz Bizon2015-12-081-0/+3
| | | | |
| * | | | Fix url helpers in RepositoryPushGrzegorz Bizon2015-12-081-3/+4
| | | | |
| * | | | Remove obsolete variables in `repository_push_email`Grzegorz Bizon2015-12-084-48/+46
| | | | |
| * | | | Improve Messagee::RepositoryPushGrzegorz Bizon2015-12-082-64/+68
| | | | |
| * | | | Refactor RepositoryPush, move to Message namespaceGrzegorz Bizon2015-12-083-134/+140
| | | | |
| * | | | Make `can_send_from_user_email?` public in NotifyGrzegorz Bizon2015-12-081-2/+2
| | | | |
| * | | | Extract repository_push_email to separate classGrzegorz Bizon2015-12-082-77/+135
| | | | |
| * | | | Enable rubocop metricsGrzegorz Bizon2015-12-081-19/+24
| | | | | | | | | | | | | | | | | | | | | | | | | This enables rubocop metrics like CyclomaticComplexity and ABCSize. Initial threshold values are high, should be probably decreased.
* | | | | Merge branch 'fix/award-emoji-alert-width' into 'master' Grzegorz Bizon2015-12-114-13/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix award-emojis alert flash message This adds a new feature to `Flash` that allows to pin it after a specified selector. This removes a fixed position from such award-emoji alert, and makes it responsive by design of selector that this alert is pinned to. Closes #3996 \cc @vsizov See merge request !2065
| * | | | | Update changelogGrzegorz Bizon2015-12-111-0/+1
| | | | | |
| * | | | | Fix award-emojis alert flash messageGrzegorz Bizon2015-12-113-13/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a new feature to `Flash` that allows to pin it after a specified selector. This removes a fixed position from such award-emoji alert, and makes it responsive by design of selector that this alert is pinned to. Closes #3996
* | | | | Merge branch 'emoji_aliases' into 'master' Valery Sizov2015-12-116-3/+55
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emoji aliases problem Fixes #3850 See merge request !2064
| * | | | | emoji aliases problemValery Sizov2015-12-116-3/+55
|/ / / / /
* | | | | Merge branch 'zj/gitlab-ce-copying-file-seen-as-licence'Douwe Maan2015-12-113-3/+39
|\ \ \ \ \
| * | | | | Target right releaseZeger-Jan van de Weg2015-12-101-1/+1
| | | | | |
| * | | | | Merge branch 'master' into copying-file-seen-as-licenceZeger-Jan van de Weg2015-12-101055-9051/+18539
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Licence also accepted as license fileZeger-Jan van de Weg2015-12-103-9/+26
| | | | | |
| * | | | | Set changelog item to right releaseZeger-Jan van de Weg2015-11-111-1/+1
| | | | | |
View Lorry Controller Status