summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* update to current master and fix conflictsissue-title-vueRegis2017-03-2193-191/+365
|\
| * Merge branch 'index-routes-path-for-like' into 'master' Douwe Maan2017-03-211-0/+2
| |\
| | * Add LIKE index for routes.pathYorick Peterse2017-03-211-0/+2
| * | Add a rake task to reset all email and private tokensJames Lopez2017-03-211-0/+38
| * | Merge branch 'api-project-issues-404' into 'master' Sean McGivern2017-03-212-2/+2
| |\ \ | | |/ | |/|
| | * Return 404 in project issues API endpoint when project cannot be foundAdam Niedzielski2017-03-202-2/+2
| * | Merge branch '29685-wrong-number-of-arguments-calling-http_url_to_repo-on-clo...Sean McGivern2017-03-211-0/+6
| |\ \
| | * | Fix ProjectWiki#http_url_to_repo signatureRémy Coutable2017-03-201-0/+6
| | |/
| * | Merge branch 'sh-fix-admin-application-settings' into 'master' Robert Speicher2017-03-211-2/+2
| |\ \
| | * | Make level_value accept string integersToon Claes2017-03-201-2/+2
| * | | Merge remote-tracking branch 'dev/master'DJ Mountney2017-03-203-2/+62
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'ssrf' into 'security' Rubén Dávila2017-03-201-0/+2
| | * | Merge branch 'ssrf' into 'security' Douwe Maan2017-03-201-0/+57
| | * | Merge branch 'fix-links-target-blank' into 'security'Jacob Schatz2017-03-202-2/+3
| * | | Merge branch 'fix/regressions-in-ci-v4-api' into 'master' Kamil Trzciński2017-03-203-13/+19
| |\ \ \
| | * | | Send only defined dependenciesTomasz Maczukin2017-03-201-1/+1
| | * | | Send token of depenent jobTomasz Maczukin2017-03-201-1/+1
| | * | | Remove legacy Runners support in /api/v4/jobs/requestTomasz Maczukin2017-03-202-11/+6
| | * | | Make runner's veryfication working againTomasz Maczukin2017-03-201-0/+11
| * | | | Allow dot in branch name in trigger/builds endpoint in APIGeorge Andrinopoulos2017-03-202-2/+2
| * | | | Allow unauthenticated access to some Branch API GET endpointsRémy Coutable2017-03-201-1/+1
| |/ / /
| * | | Merge branch '3kami3/gitlab-ce-real_ip'Rémy Coutable2017-03-202-0/+14
| |\ \ \ | | |/ / | |/| |
| | * | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9623#note_245736553kami32017-03-032-2/+4
| | * | Add real_ip setting to nginx example.3kami32017-03-012-0/+12
| * | | All CI offline migrationsKamil Trzciński2017-03-173-28/+9
| | |/ | |/|
| * | Merge branch 'database-config-method' into 'master' Rémy Coutable2017-03-171-1/+5
| |\ \
| | * | Added Gitlab::Database.configYorick Peterse2017-03-171-1/+5
| * | | Merge branch 'feature/use-gitaly-for-commit-show' into 'master'Robert Speicher2017-03-174-3/+61
| |\ \ \ | | |/ / | |/| |
| | * | Use Gitaly for CommitController#showfeature/use-gitaly-for-commit-showAhmad Sherif2017-03-154-3/+61
| * | | Merge branch '29604-v3-fix-branch-creation' into 'master' Sean McGivern2017-03-171-0/+21
| |\ \ \
| | * | | Use "branch_name" instead "branch" on V3 branch creation API29604-v3-fix-branch-creationOswaldo Ferreira2017-03-161-0/+21
| * | | | Merge branch '26470-branch-names-with-reference-prefixes-results-in-buggy-bra...Sean McGivern2017-03-171-0/+3
| |\ \ \ \
| | * | | | Strip reference prefixes on branch creationMatthieu Tardy2017-01-091-0/+3
| * | | | | Use Enumerable#index_by where possibledm-use-index-byDouwe Maan2017-03-163-13/+3
| | |/ / / | |/| | |
| * | | | Merge branch 'pages-multiple-ips-doc' into 'master' Kamil Trzciński2017-03-161-2/+2
| |\ \ \ \
| | * | | | The GitLab Pages external-http and external-https arguments can be specified ...Nick Thomas2017-03-081-2/+2
| * | | | | Merge branch '27988-fix-transient-failure-in-commits-api' into 'master' Sean McGivern2017-03-1659-76/+86
| |\ \ \ \ \
| | * | | | | Add `requirements: { id: %r{[^/]+} }` for all projects and groups namespaced ...Rémy Coutable2017-03-1659-76/+86
| | * | | | | Ensure dots in project path is allowed in the commits APIRémy Coutable2017-03-142-2/+2
| | | |_|/ / | | |/| | |
| * | | | | Merge branch '29565-name-of-the-uncompressed-folder-of-a-tag-archive-changed'...Rémy Coutable2017-03-161-1/+1
| |\ \ \ \ \
| | * | | | | Fix archive prefix bug for refs containing dotsMark Fletcher2017-03-161-1/+1
| * | | | | | This quick-fixes an issue with existing award emoji not being valid anymoreRémy Coutable2017-03-161-14/+4
| * | | | | | Merge branch '27114-add-undo-mark-all-as-done-to-todos' into 'master' Filipa Lacerda2017-03-161-2/+2
| |\ \ \ \ \ \
| | * | | | | | Add 'Undo mark all as done' to TodosJacopo2017-03-161-2/+2
| * | | | | | | Merge branch 'remove-es6-extension-configuration' into 'master' Filipa Lacerda2017-03-161-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | remove all references to the .es6 in our config files and documentationremove-es6-extension-configurationMike Greiling2017-03-151-2/+2
| * | | | | | | | Futher rename the CI variableszj-rename-ci-varsZ.J. van de Weg2017-03-161-1/+1
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'dm-fix-mailroom-config' into 'master' DJ Mountney2017-03-161-2/+6
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fix config/mail_room.yml to be interpretable RubyDouwe Maan2017-03-151-0/+1
| | * | | | | | Verify config/mail_room.yml is interpretable RubyDouwe Maan2017-03-151-2/+5
| | | |/ / / / | | |/| | | |