summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add CHANGELOG entryupdate-gitlab-markup-gemDouglas Barbosa Alexandre2017-01-091-0/+4
* Update the gitlab-markup gem to the version `1.5.1`Douglas Barbosa Alexandre2017-01-092-3/+3
* Merge branch '19086-double-newline' into 'master' Sean McGivern2017-01-093-1/+13
|\
| * Add changelog entryJared Deckard2016-12-281-0/+4
| * Test newline and carraige return groupsJared Deckard2016-12-281-0/+8
| * Replace carriage return combos with line breaks tagsJared Deckard2016-12-281-1/+1
* | Merge branch 'remove-successful-pipeline-emails-for-now' into 'master' Sean McGivern2017-01-094-2/+13
|\ \
| * | Introduce EXCLUDED_WATCHER_EVENTS to exclude eventsremove-successful-pipeline-emails-for-nowLin Jen-Shin2017-01-052-2/+5
| * | Make successful pipeline emails off for watchersLin Jen-Shin2017-01-053-2/+10
* | | Merge branch 'feature/log-ldap-to-application-log' into 'master' Rémy Coutable2017-01-094-15/+87
|\ \ \
| * | | fixup! Log messages when blocking/unblocking LDAP accountsMarkus Koller2016-12-202-2/+2
| * | | fixup! Log messages when blocking/unblocking LDAP accountsMarkus Koller2016-12-201-4/+7
| * | | Log messages when blocking/unblocking LDAP accountsMarkus Koller2016-12-204-13/+82
* | | | Merge branch '26051-fix-missing-endpoint-route-method' into 'master' tc-add-gitlab-flow-to-engineeringRémy Coutable2017-01-094-3/+25
|\ \ \ \
| * | | | Don't instrument 405 Grape calls26051-fix-missing-endpoint-route-methodRémy Coutable2017-01-094-3/+25
* | | | | Merge branch '8-16-update-guides' into 'master' Rémy Coutable2017-01-092-2/+239
|\ \ \ \ \
| * | | | | updated due to reorder changes [ci skip]James Lopez2017-01-091-26/+61
| * | | | | use ruby 2.3.3 also in the update guide [ci skip]James Lopez2017-01-091-3/+3
| * | | | | added update guides for 8.16 [ci skip]James Lopez2017-01-092-2/+204
|/ / / / /
* | | | | Merge branch '26014-fix-update-doc' into 'master' Achilleas Pipinellis2017-01-094-49/+87
|\ \ \ \ \
| * | | | | Re-order update steps in the 8.14 -> 8.15 upgrade guide26014-fix-update-docRémy Coutable2017-01-094-49/+87
| |/ / / /
* | | | | Merge branch 'track_last_used_date_of_ssh_keys' into 'master' Sean McGivern2017-01-0912-1/+78
|\ \ \ \ \
| * | | | | Record and show last used date of SSH KeysVincent Wong2017-01-0912-1/+78
* | | | | | Merge branch 'fix-broken-url-on-group-avatar' into 'master' Sean McGivern2017-01-093-1/+37
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix broken url on group avatarhogewest2017-01-063-1/+37
* | | | | | Merge branch 'fix-link-reply-by-email' into 'master' Achilleas Pipinellis2017-01-061-2/+2
|\ \ \ \ \ \
| * | | | | | Fix dead link in Reply by email documentationfix-link-reply-by-emailAchilleas Pipinellis2017-01-061-2/+2
* | | | | | | Merge branch '25371-environments-date-created-column-is-not-labeled' into 'ma...Clement Ho2017-01-062-1/+5
|\ \ \ \ \ \ \
| * | | | | | | Add label to Environments "Date Created" columnSaad Shahd2016-12-302-1/+5
* | | | | | | | Merge branch '25985-combine-members-and-groups-settings-pages' into 'master' Alfredo Sumaran2017-01-0634-164/+218
|\ \ \ \ \ \ \ \
| * | | | | | | | Moved the "import" button next to the "Add to project" button25985-combine-members-and-groups-settings-pagesJose Ivan Vargas2017-01-064-3/+6
| * | | | | | | | Fixed a test and change the arrow functions to named functionsJose Ivan Vargas2017-01-042-5/+5
| * | | | | | | | Added UX improvementsJose Ivan Vargas2017-01-032-23/+21
| * | | | | | | | Fixed es6 lint errors, and reverted a change to a helperJose Ivan Vargas2017-01-034-9/+8
| * | | | | | | | Added CHANGELOGJose Ivan Vargas2017-01-031-0/+5
| * | | | | | | | Fixed testsJose Ivan Vargas2017-01-031-3/+3
| * | | | | | | | Updated the "users" to "members" matches in the viewJose Ivan Vargas2017-01-037-13/+12
| * | | | | | | | Updated some tests descriptions to represent the correct settings pathJose Ivan Vargas2017-01-034-10/+6
| * | | | | | | | Added tests for the MembersController and corrected some more testsJose Ivan Vargas2017-01-032-1/+15
| * | | | | | | | Removed the "Groups" option from the settings gearJose Ivan Vargas2017-01-037-18/+15
| * | | | | | | | Added groups to members section, added a members finderJose Ivan Vargas2017-01-037-20/+35
| * | | | | | | | Fixed more rspec tests as well as spinach featuresJose Ivan Vargas2017-01-034-5/+7
| * | | | | | | | Fixed rspec tests for the project members also fixed the indexJose Ivan Vargas2017-01-0310-68/+24
| * | | | | | | | Moved the members (project_members)option to a single controller called membersJose Ivan Vargas2017-01-0314-43/+113
* | | | | | | | | Merge branch 'support-google-cloud-storage-backups' into 'master' Stan Hu2017-01-064-1/+51
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Re-add Google Cloud Storage as a backup strategysupport-google-cloud-storage-backupsRémy Coutable2017-01-064-1/+51
* | | | | | | | | | Merge branch 'ux-copy-capitalization-punctuation' into 'master' Allison Whilden2017-01-061-14/+90
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Improve UX copy docs on capitalization and punctuationux-copy-capitalization-punctuationPedro Moreira da Silva2017-01-041-14/+90
* | | | | | | | | | Merge branch 'fixed-failing-markdown-input-tests' into 'master' Rémy Coutable2017-01-061-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed failing markdown button testsPhil Hughes2017-01-061-2/+2
View Lorry Controller Status