summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge branch 'fix-optimistic-locking-for-destroy' into 'master' Stan Hu2016-12-012-7/+40
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Use Arel to avoid MySQL triple quotingfix-optimistic-locking-for-destroyLin Jen-Shin2016-12-011-2/+1
| * | | | | | | | | | | | Make deleting with optimistic locking respect NULLLin Jen-Shin2016-12-012-7/+41
* | | | | | | | | | | | | Merge branch '24669-merge-request-dashboard-page-takes-over-a-minute-to-load'...Yorick Peterse2016-12-016-12/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix have_issuable_counts matcher on failure24669-merge-request-dashboard-page-takes-over-a-minute-to-loadSean McGivern2016-12-011-4/+4
| * | | | | | | | | | | | | Don't include ignored params in cache keySean McGivern2016-12-011-0/+1
| * | | | | | | | | | | | | Add changelog entrySean McGivern2016-12-011-0/+4
| * | | | | | | | | | | | | Count all issuable states at onceSean McGivern2016-12-012-6/+29
| * | | | | | | | | | | | | Save a query on issue and MR listsSean McGivern2016-12-012-2/+2
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'rescue-from-redis-init-errors' into 'master' Stan Hu2016-12-012-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Gracefully recover from Redis connection failures in Sidekiq initializerStan Hu2016-12-012-1/+5
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'use-st-commits-where-possible' into 'master' Yorick Peterse2016-12-0111-44/+73
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Replace references to MergeRequestDiff#commits with st_commitsuse-st-commits-where-possibleAdam Niedzielski2016-12-0111-44/+73
* | | | | | | | | | | | | Merge branch 'docs/container-registry-2fa' into 'master' Achilleas Pipinellis2016-12-013-21/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Document the need to use a PAT with Registry when 2FA is onAchilleas Pipinellis2016-12-013-21/+43
* | | | | | | | | | | | | Merge branch 'docs/fix-webhooks-headings' into 'master' Achilleas Pipinellis2016-12-012-35/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Small refactor of webhooks docsAchilleas Pipinellis2016-12-012-35/+46
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'docs/triggers-ref-clarify' into 'master' Achilleas Pipinellis2016-12-011-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Clarify that a commit SHA doesn't work for CI triggersAchilleas Pipinellis2016-12-011-3/+7
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'docs/fix-typo-build-artifacts' into 'master' Achilleas Pipinellis2016-12-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix wrong link in builds artifacts admin docsAchilleas Pipinellis2016-12-011-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'rs-include-emailhelpers' into 'master' Rémy Coutable2016-12-0110-1/+16
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Only include EmailHelpers in mailer specs and specs using themrs-include-emailhelpersRobert Speicher2016-12-0110-1/+16
* | | | | | | | | | | | Merge branch 'remove-order-dependency-in-label-finder-spec' into 'master' Rémy Coutable2016-12-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Rename a label to fix an intermittently-failing specNick Thomas2016-12-011-1/+1
* | | | | | | | | | | | | Merge branch 'clean-up-jira-service' into 'master' Sean McGivern2016-12-015-44/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Refactor JiraService by moving code out of JiraService#execute methodclean-up-jira-serviceAdam Niedzielski2016-12-015-44/+61
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'improve_oauth_user_error' into 'master' Rémy Coutable2016-12-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Improve the `Gitlab::OAuth::User` error messageDrew Blessing2016-11-301-1/+1
* | | | | | | | | | | | Merge branch 'refactor-issuable-branch-chooser' into 'master' Robert Speicher2016-12-012-24/+31
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Refactor branch chooser in issuable formrefactor-issuable-branch-chooserRémy Coutable2016-11-302-24/+31
* | | | | | | | | | | | Merge branch '23718/backup-rake-task-human-readable' into 'master' Douwe Maan2016-12-014-8/+47
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add Human Readable Timestamp to backup tar fileDavid Gerő2016-11-304-8/+47
* | | | | | | | | | | | | Merge branch '22719-provide-a-new-gitlab-workhorse-install-rake-task-similar-...Robert Speicher2016-12-0116-192/+662
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Move task helpers to a module22719-provide-a-new-gitlab-workhorse-install-rake-task-similar-to-gitlab-shell-installRémy Coutable2016-11-3014-260/+262
| * | | | | | | | | | | | Add #run_command! to task helpers to raise a TaskFailedError if status is not 0Rémy Coutable2016-11-306-26/+246
| * | | | | | | | | | | | New `gitlab:workhorse:install` rake taskRémy Coutable2016-11-309-47/+295
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fix/git-access-wiki-when-repository-feature-disabled' into 'mas...Sean McGivern2016-11-306-3/+57
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add CHANGELOG entryfix/git-access-wiki-when-repository-feature-disabledDouglas Barbosa Alexandre2016-11-301-0/+4
| * | | | | | | | | | | | Improve Gitlab::GitAccessWiki spec with download access checksDouglas Barbosa Alexandre2016-11-301-0/+25
| * | | | | | | | | | | | Improve ProjectPolicy spec to check permissions when wiki is disabledDouglas Barbosa Alexandre2016-11-301-2/+12
| * | | | | | | | | | | | Allow access to the wiki with git when repository feature disabledDouglas Barbosa Alexandre2016-11-303-1/+16
* | | | | | | | | | | | | Merge branch '24710-fix-generic-commit-status-table-row' into 'master' Fatih Acet2016-11-303-39/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | add CHANGELOG.md entry for !781124710-fix-generic-commit-status-table-rowMike Greiling2016-11-291-0/+4
| * | | | | | | | | | | | | collapse nested if statementMike Greiling2016-11-292-6/+4
| * | | | | | | | | | | | | remove redundant if statementMike Greiling2016-11-292-4/+0
| * | | | | | | | | | | | | reformat build duration and finish time to match /ci/builds/_build.html.hamlMike Greiling2016-11-291-8/+12
| * | | | | | | | | | | | | reorder generic commit status columns to match build status partialMike Greiling2016-11-291-22/+29
| * | | | | | | | | | | | | fetch local parameters in _generic_commit_status.html.haml similar to how _bu...Mike Greiling2016-11-291-8/+16
* | | | | | | | | | | | | | Merge branch 'autocomplete-stays-open' into 'master' Fatih Acet2016-11-301-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |