summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Restore backup correctly when "BACKUP" environment variable is passedrestore-backup-when-env-variable-is-passedAdam Niedzielski2017-01-095-36/+136
|
* Introduce "stub_env" test helper for safely stubbing environment variablesAdam Niedzielski2017-01-093-5/+14
|
* Merge branch 'remove-successful-pipeline-emails-for-now' into 'master' Sean McGivern2017-01-094-2/+13
|\ | | | | | | | | | | | | Make successful pipeline emails off for watchers Closes #24845 See merge request !8176
| * Introduce EXCLUDED_WATCHER_EVENTS to exclude eventsremove-successful-pipeline-emails-for-nowLin Jen-Shin2017-01-052-2/+5
| | | | | | | | | | for watchers. Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8176#note_20920905
| * Make successful pipeline emails off for watchersLin Jen-Shin2017-01-053-2/+10
| | | | | | | | Closes #24845
* | Merge branch 'feature/log-ldap-to-application-log' into 'master' Rémy Coutable2017-01-094-15/+87
|\ \ | | | | | | | | | | | | Log LDAP blocking/unblocking events to application log See merge request !8042
| * | 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 calls Closes #26051 See merge request !8445
| * | | Don't instrument 405 Grape calls26051-fix-missing-endpoint-route-methodRémy Coutable2017-01-094-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #26051. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch '8-16-update-guides' into 'master' Rémy Coutable2017-01-092-2/+239
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Added update guides for 8.16RC1 See merge request !8502
| * | | | 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 guide Closes #26014 See merge request !8287
| * | | | Re-order update steps in the 8.14 -> 8.15 upgrade guide26014-fix-update-docRémy Coutable2017-01-094-49/+87
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Gems need to be installed before we can run the gitlab:workhorse:install task 1. Update gitlab-shell after gitlab-workhorse since it's a manual step that needs to be done in `/home/git/gitlab-shell` Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | 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 Keys See merge request !8113
| * | | | Record and show last used date of SSH KeysVincent Wong2017-01-0912-1/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addresses: Issue #13810 1. Adds a last_used_at attribute to the Key table/model 2. Update a key's last_used_at whenever it gets used 3. Display how long ago an ssh key was last used
* | | | | Merge branch 'fix-broken-url-on-group-avatar' into 'master' Sean McGivern2017-01-093-1/+37
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix broken url on group avatar Closes #26452 See merge request !8464
| * | | | 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 documentation Closes #26247 See merge request !8474
| * | | | | 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 ↵Clement Ho2017-01-062-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add label to Environments "Date Created" column Closes #25371 See merge request !8376
| * | | | | | 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 members and groups to single option called members Closes #25985 See merge request !8281
| * | | | | | | Moved the "import" button next to the "Add to project" button25985-combine-members-and-groups-settings-pagesJose Ivan Vargas2017-01-064-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed padding and margins for the dropdowns on the members section
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reverted the change from the "expires_at" to "expires_at_groups" in the groups controller
| * | | | | | | Updated some tests descriptions to represent the correct settings pathJose Ivan Vargas2017-01-034-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated the js from the member_expiration_date to es6
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed more tests
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | view (removed an extra tag )
| * | | | | | | Moved the members (project_members)option to a single controller called membersJose Ivan Vargas2017-01-0314-43/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This controller is going to contain both the project members and groups options for the settings gear. Generated the route and modified the routing to point to the new members setting path
* | | | | | | | Merge branch 'support-google-cloud-storage-backups' into 'master' Stan Hu2017-01-064-1/+51
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-add Google Cloud Storage as a backup strategy Closes #26362 See merge request !8481
| * | | | | | | | Re-add Google Cloud Storage as a backup strategysupport-google-cloud-storage-backupsRémy Coutable2017-01-064-1/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Merge branch 'ux-copy-capitalization-punctuation' into 'master' Allison Whilden2017-01-061-14/+90
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Improve UX copy docs on capitalization and punctuation See merge request !8439
| * | | | | | | | 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 tests See merge request !8471
| * | | | | | | | | Fixed failing markdown button testsPhil Hughes2017-01-061-2/+2
| | | | | | | | | |
* | | | | | | | | | Merge branch 'fixed-edit-form-failing-test' into 'master' Rémy Coutable2017-01-062-3/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed edit form authenticity_token call failing the tests See merge request !8472
| * | | | | | | | | | Fixed edit form authenticity_token call failing the testsfixed-edit-form-failing-testPhil Hughes2017-01-062-3/+4
| |/ / / / / / / / /
* | | | | | | | | | Update CHANGELOG.md for 8.15.3Douglas Barbosa Alexandre2017-01-0618-68/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | Merge branch 'update-gitea-importer-doc' into 'master' Rémy Coutable2017-01-061-4/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With Gitea v1.0.0, notes are imported See merge request !8298
View Lorry Controller Status