summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* add changelogfix/web_hooks-indexJames Lopez2017-04-251-0/+4
* add index to webhooks type columnJames Lopez2017-04-242-1/+17
* Merge branch 'master' into 'master' Douwe Maan2017-04-241-1/+1
|\
| * Correct typo (missing 's') in project pipeline job list endpointBen Getsug2017-04-211-1/+1
* | Merge branch 'dz-fix-spec-filenames-ce' into 'master' Sean McGivern2017-04-245-51/+46
|\ \
| * | Fix outdated specs that were not executed due to wrong filenameDmitriy Zaporozhets2017-04-242-4/+6
| * | Fix incorrect spec filenames which were ingored by CIdz-fix-spec-filenames-ceDmitriy Zaporozhets2017-04-245-47/+40
* | | Merge branch '29335-fix-request-access-button-visibility' into 'master' Douwe Maan2017-04-241-0/+11
|\ \ \
| * | | Added test to prevent ‘Request access’ regression29335-fix-request-access-button-visibilityJames Edwards-Jones2017-04-221-0/+11
* | | | Merge branch 'mrchrisw-22740-merge-api' into 'master' Sean McGivern2017-04-243-4/+21
|\ \ \ \
| * | | | Fix updating merge_when_build_succeeds via merge API endpointmrchrisw-22740-merge-apiChris Wilson2017-04-243-4/+21
* | | | | Merge branch 'db-backup-ssl-support' into 'master' Achilleas Pipinellis2017-04-242-5/+25
|\ \ \ \ \
| * | | | | Database SSL support for backup script.Guillaume2017-04-052-5/+25
* | | | | | Merge branch 'gitaly-upgrade-doc' into 'master' Sean McGivern2017-04-241-0/+11
|\ \ \ \ \ \
| * | | | | | Fix 9.1 Gitaly source update stepsJacob Vosmaer2017-04-241-0/+11
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'siemens/gitlab-ce-uploads-api' into 'master' Rémy Coutable2017-04-241-2/+13
|\ \ \ \ \ \
| * | | | | | docs(api): add curl arguments for file uploadsiemens/gitlab-ce-uploads-apiMarion Deveaud2017-04-211-2/+13
* | | | | | | Merge branch 'rs-rename-login_as' into 'master' Rémy Coutable2017-04-249-18/+74
|\ \ \ \ \ \ \
| * | | | | | | Return early from `finished_all_ajax_requests?` when jQuery is undefinedrs-rename-login_asRobert Speicher2017-04-191-0/+1
| * | | | | | | Simplify the `javascript_test?` helperRobert Speicher2017-04-191-1/+3
| * | | | | | | Except where necessary, use `sign_in` over `login_as` in featuresRobert Speicher2017-04-197-13/+70
| * | | | | | | Remove unused `skip_ci_admin_auth` helperRobert Speicher2017-04-191-4/+0
* | | | | | | | Merge branch 'workhorse-secret-path' into 'master' Rémy Coutable2017-04-243-1/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Make location of gitlab_workhorse_secret configurableJakub Jirutka2017-04-193-1/+12
* | | | | | | | | Merge branch 'add_index_on_ci_builds_updated_at' into 'master' Yorick Peterse2017-04-243-1/+25
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Add index on ci_builds.updated_atblackst0ne2017-04-233-1/+25
* | | | | | | | | Merge branch '30306-transaction-while-moving-issues-to-ghost-user' into 'mast...Yorick Peterse2017-04-244-11/+97
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add changelog entry for !1046530306-transaction-while-moving-issues-to-ghost-userTimothy Andrew2017-04-241-0/+4
| * | | | | | | | | Move records to the ghost user in a transaction.Timothy Andrew2017-04-243-11/+93
* | | | | | | | | | Merge branch 'fix_link_in_readme' into 'master' Rémy Coutable2017-04-242-1/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix wrong link to GDK in README filedixpac2017-04-152-1/+5
* | | | | | | | | | | Merge branch 'mention-new-frontend-fixtures' into 'master' Rémy Coutable2017-04-241-2/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Mention new mechanism to generate frontend fixturesWinnie Hellmann2017-04-141-2/+4
* | | | | | | | | | | | Merge branch '29801-add-slash-slack-commands-to-api-doc' into 'master' Sean McGivern2017-04-242-11/+73
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | [#29801] Add "Slack Slash Commands" to API docsTM Lee2017-04-242-11/+73
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' into 'master' Sean McGivern2017-04-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update plantuml.md Fix wrong order when restarting tomcat service [ci skip] Vladimir Tasic2017-04-211-1/+1
* | | | | | | | | | | | | Merge branch '31072-activity-border' into 'master' Phil Hughes2017-04-242-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix border color on activities page31072-activity-borderAnnabel Dunstone Gray2017-04-212-2/+1
* | | | | | | | | | | | | Merge branch 'submodules-no-dotgit' into 'master' Dmitriy Zaporozhets2017-04-223-9/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | submodule_links: handle urls that don't end with .gitDavid Turner2017-04-213-9/+19
* | | | | | | | | | | | | | Update VERSION to 9.2.0-prev9.2.0.preFelipe Artur2017-04-221-1/+1
* | | | | | | | | | | | | | Update CHANGELOG.md for 9.1.0Felipe Artur2017-04-22234-941/+248
* | | | | | | | | | | | | | Merge branch 'backup-restore-docs-update' into 'master' Marcia Ramos2017-04-221-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Reword backup & restore secrets descriptionbackup-restore-docs-updateCindy Pallares2017-04-201-4/+6
* | | | | | | | | | | | | | | Merge branch 'dm-fix-project-import' into 'master' Robert Speicher2017-04-211-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Disable import URL field in New project form since it's hidden by defaultDouwe Maan2017-04-211-2/+3
| | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch '31265-update-auto-deploy-documentation-for-postgres-and-private...Achilleas Pipinellis2017-04-212-2/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Update Auto Deploy documentationJoshua Lambert2017-04-212-2/+32
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'remove-burndown-chart-reference-from-docs' into 'master' Felipe Artur2017-04-211-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |