summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Merge branch '27494-environment-list-column-headers' into 'master' Annabel Dunstone Gray2017-02-013-2/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edited the column header for the environments list from created to updated and a… Closes #27494 See merge request !8904
| * | | | | | | | | | Edited the column header for the environments list from created to updated ↵27494-environment-list-column-headersdimitrieh2017-01-313-2/+6
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | and added created to environments detail page colum header titles
* | | | | | | | | | Merge branch 'zj-format-chat-messages' into 'master' Kamil Trzciński2017-02-0128-261/+679
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Format chat messages Closes #24917 and #25746 See merge request !8528
| * | | | | | | | | Improve styling of the new issue messagezj-format-chat-messagesZ.J. van de Weg2017-01-311-2/+2
| | | | | | | | | |
| * | | | | | | | | Incorporate feedbackZ.J. van de Weg2017-01-309-18/+49
| | | | | | | | | |
| * | | | | | | | | Merge branch 'zj-format-chat-messages' of gitlab.com:gitlab-org/gitlab-ce ↵Z.J. van de Weg2017-01-300-0/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zj-format-chat-messages
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into 'zj-format-chat-messages'Zeger-Jan van de Weg2017-01-26482-1309/+4453
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # spec/lib/gitlab/chat_commands/command_spec.rb
| | * | | | | | | | | | Rename presenters for consitencyZ.J. van de Weg2017-01-2615-36/+51
| | | | | | | | | | | |
| | * | | | | | | | | | Incorporate feedbackZ.J. van de Weg2017-01-2419-189/+565
| | | | | | | | | | | |
| | * | | | | | | | | | Fix testsZ.J. van de Weg2017-01-241-6/+2
| | | | | | | | | | | |
| | * | | | | | | | | | Add help commandZ.J. van de Weg2017-01-243-8/+53
| | | | | | | | | | | |
| | * | | | | | | | | | Revert removing of some filesZ.J. van de Weg2017-01-245-0/+221
| | | | | | | | | | | |
| | * | | | | | | | | | Chat Commands have presentersZ.J. van de Weg2017-01-2432-758/+476
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves the styling and readability of the code. This is supported by both Mattermost and Slack.
| * | | | | | | | | | | Rename presenters for consitencyZ.J. van de Weg2017-01-3016-40/+51
| | | | | | | | | | | |
| * | | | | | | | | | | Incorporate feedbackZ.J. van de Weg2017-01-3019-189/+565
| | | | | | | | | | | |
| * | | | | | | | | | | Fix testsZ.J. van de Weg2017-01-301-6/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Add help commandZ.J. van de Weg2017-01-303-8/+53
| | | | | | | | | | | |
| * | | | | | | | | | | Revert removing of some filesZ.J. van de Weg2017-01-303-0/+167
| | | | | | | | | | | |
| * | | | | | | | | | | Chat Commands have presentersZ.J. van de Weg2017-01-3029-687/+479
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves the styling and readability of the code. This is supported by both Mattermost and Slack.
* | | | | | | | | | | Merge branch 'fix/import-user-validation-error' into 'master' Rémy Coutable2017-01-313-0/+30
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix user validation error in Import/Export Closes #23833 See merge request !8909
| * | | | | | | | | | | update specfix/import-user-validation-errorJames Lopez2017-01-311-6/+2
| | | | | | | | | | | |
| * | | | | | | | | | | use destroy_allJames Lopez2017-01-311-3/+1
| | | | | | | | | | | |
| * | | | | | | | | | | add changelogJames Lopez2017-01-311-0/+4
| | | | | | | | | | | |
| * | | | | | | | | | | remove old project members from projectJames Lopez2017-01-311-0/+4
| | | | | | | | | | | |
| * | | | | | | | | | | add spec replicating validation errorJames Lopez2017-01-311-0/+28
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '27484-environment-show-name' into 'master' Fatih Acet2017-01-314-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't capitalize environment name in show page Closes #27484 See merge request !8902
| * | | | | | | | | | | | Don't capitalize environment name in show page27484-environment-show-nameFilipa Lacerda2017-01-314-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upate test to match the new behavior
* | | | | | | | | | | | | Merge branch '19164-mobile-settings' into 'master' Annabel Dunstone Gray2017-01-310-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19164 Add settings dropdown to mobile screens Closes #19164 See merge request !8896
* \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '19164-mobile-settings' into 'master' Annabel Dunstone Gray2017-01-310-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19164 Add settings dropdown to mobile screens Closes #19164 See merge request !8896
* | | | | | | | | | | | | | Merge branch '19164-mobile-settings' into 'master' Annabel Dunstone Gray2017-01-313-5/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19164 Add settings dropdown to mobile screens Closes #19164 See merge request !8896
| * | | | | | | | | | | | | Remove settings cog from within admin scroll tabs; keep links centered19164-mobile-settingsAnnabel Dunstone Gray2017-01-312-2/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | 19164 Add settings dropdown to mobile screenstauriedavis2017-01-302-4/+12
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '26982-improve-pipeline-status-icon-linking-in-widgets' into ↵Annabel Dunstone Gray2017-01-315-5/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Improve pipeline status icon linking in widgets Closes #26982 See merge request !8705
| * | | | | | | | | | | | | | Link to pipeline page from commit widget26982-improve-pipeline-status-icon-linking-in-widgetsAnnabel Dunstone Gray2017-01-301-2/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Remove underline style for icon hoverAnnabel Dunstone Gray2017-01-302-1/+7
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Improve pipeline status icon linking in widgetsdimitrieh2017-01-234-4/+10
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch '8-16-3-patch-changelog' into 'master' DJ Mountney2017-01-319-32/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the 8-16-3 changelog entries to master See merge request !8912
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'dev/master'DJ Mountney2017-01-319-32/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2017-01-319-32/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Update CHANGELOG.md for 8.16.3Robert Speicher2017-01-279-32/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | Merge branch 'cop-gem-fetcher' into 'master' Robert Speicher2017-01-313-0/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cop for gem fetched from a git source Closes #27311 See merge request !8856
| * | | | | | | | | | | | | | | | cop for gem fetched from a git sourceAdam Pahlevi2017-01-312-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | code fix for aesthetic & conventions remove unused proc
| * | | | | | | | | | | | | | | | add complete changelogAdam Pahlevi2017-01-311-0/+4
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'correct-gitlab-host-references' into 'master' Achilleas Pipinellis2017-01-314-6/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected docs href's See merge request !8527
| * | | | | | | | | | | | | | | | Corrected docs href'scorrect-gitlab-host-referencesLuke "Jared" Bennett2017-01-304-6/+5
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch '23767-disable-storing-of-sensitive-information' into 'master' Filipa Lacerda2017-01-313-4/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix disable storing of sensitive information when importing a new repo Closes #23767 See merge request !8885
| * | | | | | | | | | | | | | | | | Fix disable storing of sensitive information when importing a new repo23767-disable-storing-of-sensitive-informationClement Ho2017-01-303-4/+22
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch '395-fix-notification-when-group-set-to-watch' into 'master'Sean McGivern2017-01-313-6/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix notification when group set to watch Closes #395 See merge request !8883
| * | | | | | | | | | | | | | | | | | Fix notification when global=disabled, group=watch395-fix-notification-when-group-set-to-watchamaia2017-01-303-6/+30
| |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | | | Merge branch 'fix/27479' into 'master' Sean McGivern2017-01-313-6/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove new branch button for confidential issues Closes #27479 See merge request !8894