summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'search-bar-first-iteration' into 'master' Jacob Schatz2017-01-121-0/+1
|\
| * Add username to gonClement Ho2017-01-091-0/+1
* | Merge branch 'Sanson/gitlab-ce-asciidoctor-plantuml' into 'master' 20450-retry-build-buttonSean McGivern2017-01-124-1/+20
|\ \
| * | Add support for PlantUML diagrams in Asciidoc.Horacio Sanson2017-01-124-1/+20
* | | Merge branch 'do-not-remove-autodeploy-directory-when-fetching-ci-templates' ...Sean McGivern2017-01-121-1/+1
|\ \ \ | |/ / |/| |
| * | Do not remove "autodeploy" directory when fetching CI templatesdo-not-remove-autodeploy-directory-when-fetching-ci-templatesAdam Niedzielski2017-01-101-1/+1
| |/
* | Fix Users API to accept confirm parameterMark Fletcher2017-01-111-1/+1
* | Fix Rubocop offenses in LDAP related code and specGrzegorz Bizon2017-01-101-2/+2
* | Merge branch 'restore-backup-when-env-variable-is-passed' into 'master' Sean McGivern2017-01-101-17/+27
|\ \ | |/ |/|
| * Restore backup correctly when "BACKUP" environment variable is passedrestore-backup-when-env-variable-is-passedAdam Niedzielski2017-01-091-17/+27
* | Merge branch 'auto-pipelines-vue' into 'master' Fatih Acet2017-01-092-38/+46
|\ \
| * \ Merge branch 'master' into auto-pipelines-vueRegis2017-01-0910-23/+70
| |\ \
| * \ \ Merge branch 'master' into auto-pipelines-vueFilipa Lacerda2017-01-0521-4/+2960
| |\ \ \
| * \ \ \ Merge branch 'master' into auto-pipelines-vueRegis2017-01-046-29/+31
| |\ \ \ \
| * \ \ \ \ fix pipelines/index.html.haml merge conflictRegis2017-01-0217-205/+329
| |\ \ \ \ \
| * \ \ \ \ \ merge master and fix application.rb conflictRegis2016-12-2318-45/+188
| |\ \ \ \ \ \
| * | | | | | | Remove redundant pagination helpers after a bad mergeGrzegorz Bizon2016-12-211-32/+0
| * | | | | | | Merge branch 'master' into auto-pipelines-vueGrzegorz Bizon2016-12-2168-489/+1490
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueRegis2016-12-1617-12/+264
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueGrzegorz Bizon2016-12-1518-43/+320
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ merge masterRegis2016-12-1315-141/+904
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueGrzegorz Bizon2016-12-0917-246/+260
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueGrzegorz Bizon2016-12-0736-99/+453
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Extract API pagination code to a separete moduleGrzegorz Bizon2016-12-072-38/+46
* | | | | | | | | | | | | | Use #parts instead of #part to read all the parts of the Message.Ruben Davila2017-01-091-2/+2
| |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '19086-double-newline' into 'master' Sean McGivern2017-01-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | Replace carriage return combos with line breaks tagsJared Deckard2016-12-281-1/+1
* | | | | | | | | | | | | Merge branch 'feature/log-ldap-to-application-log' into 'master' Rémy Coutable2017-01-091-4/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | fixup! Log messages when blocking/unblocking LDAP accountsMarkus Koller2016-12-201-1/+1
| * | | | | | | | | | | | | Log messages when blocking/unblocking LDAP accountsMarkus Koller2016-12-201-4/+22
* | | | | | | | | | | | | | Merge branch '26051-fix-missing-endpoint-route-method' into 'master' tc-add-gitlab-flow-to-engineeringRémy Coutable2017-01-093-3/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Don't instrument 405 Grape calls26051-fix-missing-endpoint-route-methodRémy Coutable2017-01-093-3/+21
* | | | | | | | | | | | | | | Merge branch 'track_last_used_date_of_ssh_keys' into 'master' Sean McGivern2017-01-091-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Record and show last used date of SSH KeysVincent Wong2017-01-091-1/+7
* | | | | | | | | | | | | | | Merge branch 'fix-users-api-500-error' into 'master' Rémy Coutable2017-01-061-7/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix the failing spec in POST /users APIfix-users-api-500-errorRémy Coutable2017-01-051-7/+4
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | LDAP attributes needs default valuesDrew Blessing2017-01-063-7/+15
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '19966-api-call-to-move-project-to-different-group-fails-when-us...Rémy Coutable2017-01-051-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix groups API to accept path when transferring a projectMark Fletcher2017-01-031-3/+3
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '26261-post-api-v3-projects-idorproject-commits-commits-does-not...Rémy Coutable2017-01-051-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix Commits API to accept a Project path upon POSTMark Fletcher2017-01-031-1/+0
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'rs-absorb-gitlab_git' into 'master' Douwe Maan2017-01-0518-0/+2950
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Ensure internal Gitlab::Git references use the namespacers-absorb-gitlab_gitRobert Speicher2017-01-045-25/+25
| * | | | | | | | | | | | | | Absorb gitlab_gitRobert Speicher2017-01-0418-0/+2950
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'zj-404-slack-error' into 'master' Kamil Trzciński2017-01-051-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Add API route slack slash commandszj-404-slack-errorZ.J. van de Weg2017-01-031-0/+7
* | | | | | | | | | | | | | Merge branch 'api-refactor-issues-filter' into 'master' Sean McGivern2017-01-041-21/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add missing milestone parameterRobert Schilling2017-01-041-0/+1
| * | | | | | | | | | | | | | Refactor issues filter in APIRobert Schilling2017-01-041-21/+7
* | | | | | | | | | | | | | | Merge branch 'fix-api-project-hooks-params' into 'master' Sean McGivern2017-01-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |