summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Review changesremove-merge-request-widget-inline-jsLuke Bennett2016-09-124-171/+129
* Updated for es5Luke Bennett2016-09-124-426/+149
* Added logic for remove source branch AFTER merge, should fix final test failureLuke "Jared" Bennett2016-09-124-6/+15
* Fixing last tests, MR acceptance isn't quite right yesLuke "Jared" Bennett2016-09-122-2/+3
* Fixed some buildsLuke "Jared" Bennett2016-09-125-11/+16
* Fixed accepting MR?Luke "Jared" Bennett2016-09-122-4/+4
* added remove source branch button urlLuke "Jared" Bennett2016-09-122-26/+17
* removed old linkLuke "Jared" Bennett2016-09-121-1/+0
* Fixed unloopable progress pollLuke "Jared" Bennett2016-09-121-2/+4
* Finishing up widget partial implentation changesLuke "Jared" Bennett2016-09-124-25/+28
* Removed a few widget remote: and implemented in JSLuke "Jared" Bennett2016-09-126-44/+104
* Started removing inline widget refsLuke "Jared" Bennett2016-09-125-95/+396
* 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
* | | | | | | | Merge branch 'zj-update-ci-examples-doc' into 'master' Achilleas Pipinellis2016-09-091-6/+8
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Minor update on CI docs exampleszj-update-ci-examples-docZ.J. van de Weg2016-09-091-6/+8
* | | | | | | | Merge branch 'gitlab-workhorse-safeties' into 'master' Jacob Vosmaer (GitLab)2016-09-0916-19/+213
|\ \ \ \ \ \ \ \
| * | | | | | | | Use gitlab-workhorse 0.8.0Jacob Vosmaer2016-09-083-3/+3
| * | | | | | | | Constants in specsJacob Vosmaer2016-09-062-2/+2
| * | | | | | | | Verify JWT messages from gitlab-workhorseJacob Vosmaer2016-09-0513-16/+210
* | | | | | | | | Merge branch 'slash-commands-issuable-spec-fix' into 'master' Rémy Coutable2016-09-095-60/+44
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move write_note into SlashCommandsHelper and update other dependent specsslash-commands-issuable-spec-fixStan Hu2016-09-084-21/+24