summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Restore SSH Key title auto-population behaviorrs-ssh-key-title-populateRobert Speicher2016-09-123-0/+20
* Merge branch 'rails-5-backports' into 'master' Robert Speicher2016-09-122-7/+3
|\
| * No need for this variable.Connor Shea2016-09-121-6/+1
| * Remove x-json mime_type, rename to json_mime_types.rails-5-backportsConnor Shea2016-09-111-3/+2
| * Fix two problematic bits of code that will be deprecated or broken in Rails 5.Connor Shea2016-09-052-7/+9
* | Merge branch 'update-templates' into 'master' Robert Speicher2016-09-1213-5/+82
|\ \
| * | Update templates.update-templatesRuben Davila2016-09-0113-5/+82
* | | Merge branch '21569-dont-add-created-by-for-matched-users' into 'master' Robert Speicher2016-09-128-6/+42
|\ \ \
| * | | Only add the original author if there isn't a linked GitLab accountAndrew Smith2016-09-088-6/+42
* | | | Merge branch 'document-custom-event-tracking' into 'master' Achilleas Pipinellis2016-09-121-0/+15
|\ \ \ \
| * | | | Document how to track custom eventsYorick Peterse2016-09-121-0/+15
* | | | | Merge branch '21092-file-execution-flag-is-not-preserved-when-editing-files' ...Rémy Coutable2016-09-124-9/+7
|\ \ \ \ \
| * | | | | Simplify a condition in Repository#update_fileRémy Coutable2016-09-121-1/+1
| * | | | | fixes distinction between renaming a file and updating its content and21092-file-execution-flag-is-not-preserved-when-editing-filestiagonbotelho2016-09-094-9/+7
* | | | | | Merge branch 'issue_21825' into 'master' Rémy Coutable2016-09-124-0/+46
|\ \ \ \ \ \
| * | | | | | Add information about user and manual build start to runner as variablesSergey Gnuskov2016-09-094-0/+46
* | | | | | | Merge branch 'slightly-more-readable' into 'master' Rémy Coutable2016-09-121-3/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Make the cases clear instead of having guardsslightly-more-readableLin Jen-Shin2016-09-121-3/+3
* | | | | | | Merge branch 'sh-defer-resolvable-check' into 'master' Yorick Peterse2016-09-122-1/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Only check :can_resolve permission if the note is resolvablesh-defer-resolvable-checkStan Hu2016-09-122-1/+3
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'rc-api-use-search-globalservice-in-projects-search-api' into 'm...Rémy Coutable2016-09-122-12/+4
|\ \ \ \ \ \
| * | | | | | Use Search::GlobalService.new in the `GET /projects/search/:query` endpointrc-api-use-search-globalservice-in-projects-search-apiRémy Coutable2016-09-122-13/+4
| * | | | | | Search should compare only the lowercase versions of the project namesRazzeee2016-09-092-1/+2
* | | | | | | Merge branch 'fix-api-sorting' into 'master' Douwe Maan2016-09-123-9/+130
|\ \ \ \ \ \ \
| * | | | | | | Fix API issues sortingfix-api-sortingSean McGivern2016-09-093-9/+130
* | | | | | | | Merge branch '19359-api-for-notification-settings' into 'master' Rémy Coutable2016-09-127-1/+374
|\ \ \ \ \ \ \ \
| * | | | | | | | Add notification_settings API callsMarc Siegfriedt2016-09-097-1/+374
* | | | | | | | | Merge branch '21814-fix' into 'master' Robert Speicher2016-09-101-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Pull import sources from Gitlab::ImportSourcesOjas Shirekar2016-09-091-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'pipelines-finder-spec-fix' into 'master' Robert Speicher2016-09-101-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve PipelinesFinder spec so that it does not depend on hard-coded databas...pipelines-finder-spec-fixStan Hu2016-09-091-2/+3
* | | | | | | | | Merge branch 'enable-pipeline-events-by-default' into 'master' Robert Speicher2016-09-092-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Enable pipeline events by defaultenable-pipeline-events-by-defaultLin Jen-Shin2016-09-092-0/+2
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'restrict_ldap_return_attributes' into 'master' Robert Speicher2016-09-094-28/+149
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Request only the LDAP attributes we needDrew Blessing2016-09-094-28/+149
* | | | | | | | | | Merge branch 'add-remember-option-u2f' into 'master' Robert Speicher2016-09-097-3/+43
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Pass the remember_me option into the u2f form and support it while authentica...add-remember-option-u2fDJ Mountney2016-09-017-3/+43
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rs-changelog-archive' into 'master' Robert Speicher2016-09-093-1689/+1812
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add changelogs/unreleased/.gitkeepRobert Speicher2016-09-091-0/+0
| * | | | | | | | | | Archive CHANGELOG entries prior to 8.0 in changelogs/archive.mdRobert Speicher2016-09-092-1689/+1812
* | | | | | | | | | | Merge branch 'branches-mr-button-permissions' into 'master' Robert Speicher2016-09-093-19/+35
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Hides merge request button on branches pagebranches-mr-button-permissionsPhil Hughes2016-09-023-19/+35
* | | | | | | | | | | Merge branch 'workhorse-0.8.1' into 'master' Robert Speicher2016-09-093-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use gitlab-workhorse 0.8.1Jacob Vosmaer2016-09-093-3/+3
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'github-avoid-conflicts-with-admin-labels' into 'master' Rémy Coutable2016-09-095-11/+41
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update CHANGELOGDouglas Barbosa Alexandre2016-09-091-0/+1
| * | | | | | | | | | | Avoid conflict with admin labels when importing GitHub labelsDouglas Barbosa Alexandre2016-09-094-11/+40
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '20300-restore-comments' into 'master' Jacob Schatz2016-09-0989-139/+952
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Require comments must be included before codeJared Deckard2016-09-082-8/+5
| * | | | | | | | | | Restore comments lost when converting CoffeeScript to JavaScriptJared Deckard2016-09-0889-142/+958
| | |_|_|_|_|_|/ / / | |/| | | | | | | |