Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'search-bar-first-iteration' into 'master' | Jacob Schatz | 2017-01-12 | 1 | -0/+1 |
|\ | |||||
| * | Add username to gon | Clement Ho | 2017-01-09 | 1 | -0/+1 |
* | | Merge branch 'Sanson/gitlab-ce-asciidoctor-plantuml' into 'master' 20450-retry-build-button | Sean McGivern | 2017-01-12 | 4 | -1/+20 |
|\ \ | |||||
| * | | Add support for PlantUML diagrams in Asciidoc. | Horacio Sanson | 2017-01-12 | 4 | -1/+20 |
* | | | Merge branch 'do-not-remove-autodeploy-directory-when-fetching-ci-templates' ... | Sean McGivern | 2017-01-12 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Do not remove "autodeploy" directory when fetching CI templatesdo-not-remove-autodeploy-directory-when-fetching-ci-templates | Adam Niedzielski | 2017-01-10 | 1 | -1/+1 |
| |/ | |||||
* | | Fix Users API to accept confirm parameter | Mark Fletcher | 2017-01-11 | 1 | -1/+1 |
* | | Fix Rubocop offenses in LDAP related code and spec | Grzegorz Bizon | 2017-01-10 | 1 | -2/+2 |
* | | Merge branch 'restore-backup-when-env-variable-is-passed' into 'master' | Sean McGivern | 2017-01-10 | 1 | -17/+27 |
|\ \ | |/ |/| | |||||
| * | Restore backup correctly when "BACKUP" environment variable is passedrestore-backup-when-env-variable-is-passed | Adam Niedzielski | 2017-01-09 | 1 | -17/+27 |
* | | Merge branch 'auto-pipelines-vue' into 'master' | Fatih Acet | 2017-01-09 | 2 | -38/+46 |
|\ \ | |||||
| * \ | Merge branch 'master' into auto-pipelines-vue | Regis | 2017-01-09 | 10 | -23/+70 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into auto-pipelines-vue | Filipa Lacerda | 2017-01-05 | 21 | -4/+2960 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into auto-pipelines-vue | Regis | 2017-01-04 | 6 | -29/+31 |
| |\ \ \ \ | |||||
| * \ \ \ \ | fix pipelines/index.html.haml merge conflict | Regis | 2017-01-02 | 17 | -205/+329 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | merge master and fix application.rb conflict | Regis | 2016-12-23 | 18 | -45/+188 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Remove redundant pagination helpers after a bad merge | Grzegorz Bizon | 2016-12-21 | 1 | -32/+0 |
| * | | | | | | | Merge branch 'master' into auto-pipelines-vue | Grzegorz Bizon | 2016-12-21 | 68 | -489/+1490 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into auto-pipelines-vue | Regis | 2016-12-16 | 17 | -12/+264 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into auto-pipelines-vue | Grzegorz Bizon | 2016-12-15 | 18 | -43/+320 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | merge master | Regis | 2016-12-13 | 15 | -141/+904 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into auto-pipelines-vue | Grzegorz Bizon | 2016-12-09 | 17 | -246/+260 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into auto-pipelines-vue | Grzegorz Bizon | 2016-12-07 | 36 | -99/+453 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Extract API pagination code to a separete module | Grzegorz Bizon | 2016-12-07 | 2 | -38/+46 |
* | | | | | | | | | | | | | | Use #parts instead of #part to read all the parts of the Message. | Ruben Davila | 2017-01-09 | 1 | -2/+2 |
| |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge branch '19086-double-newline' into 'master' | Sean McGivern | 2017-01-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Replace carriage return combos with line breaks tags | Jared Deckard | 2016-12-28 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge branch 'feature/log-ldap-to-application-log' into 'master' | Rémy Coutable | 2017-01-09 | 1 | -4/+22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | fixup! Log messages when blocking/unblocking LDAP accounts | Markus Koller | 2016-12-20 | 1 | -1/+1 |
| * | | | | | | | | | | | | | Log messages when blocking/unblocking LDAP accounts | Markus Koller | 2016-12-20 | 1 | -4/+22 |
* | | | | | | | | | | | | | | Merge branch '26051-fix-missing-endpoint-route-method' into 'master' tc-add-gitlab-flow-to-engineering | Rémy Coutable | 2017-01-09 | 3 | -3/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Don't instrument 405 Grape calls26051-fix-missing-endpoint-route-method | Rémy Coutable | 2017-01-09 | 3 | -3/+21 |
* | | | | | | | | | | | | | | | Merge branch 'track_last_used_date_of_ssh_keys' into 'master' | Sean McGivern | 2017-01-09 | 1 | -1/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Record and show last used date of SSH Keys | Vincent Wong | 2017-01-09 | 1 | -1/+7 |
* | | | | | | | | | | | | | | | Merge branch 'fix-users-api-500-error' into 'master' | Rémy Coutable | 2017-01-06 | 1 | -7/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Fix the failing spec in POST /users APIfix-users-api-500-error | Rémy Coutable | 2017-01-05 | 1 | -7/+4 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | LDAP attributes needs default values | Drew Blessing | 2017-01-06 | 3 | -7/+15 |
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch '19966-api-call-to-move-project-to-different-group-fails-when-us... | Rémy Coutable | 2017-01-05 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Fix groups API to accept path when transferring a project | Mark Fletcher | 2017-01-03 | 1 | -3/+3 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch '26261-post-api-v3-projects-idorproject-commits-commits-does-not... | Rémy Coutable | 2017-01-05 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Fix Commits API to accept a Project path upon POST | Mark Fletcher | 2017-01-03 | 1 | -1/+0 |
| |/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Merge branch 'rs-absorb-gitlab_git' into 'master' | Douwe Maan | 2017-01-05 | 18 | -0/+2950 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Ensure internal Gitlab::Git references use the namespacers-absorb-gitlab_git | Robert Speicher | 2017-01-04 | 5 | -25/+25 |
| * | | | | | | | | | | | | | | Absorb gitlab_git | Robert Speicher | 2017-01-04 | 18 | -0/+2950 |
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'zj-404-slack-error' into 'master' | Kamil Trzciński | 2017-01-05 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Add API route slack slash commandszj-404-slack-error | Z.J. van de Weg | 2017-01-03 | 1 | -0/+7 |
* | | | | | | | | | | | | | | Merge branch 'api-refactor-issues-filter' into 'master' | Sean McGivern | 2017-01-04 | 1 | -21/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Add missing milestone parameter | Robert Schilling | 2017-01-04 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | Refactor issues filter in API | Robert Schilling | 2017-01-04 | 1 | -21/+7 |
* | | | | | | | | | | | | | | | Merge branch 'fix-api-project-hooks-params' into 'master' | Sean McGivern | 2017-01-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |