Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | Merge branch 'fix-optimistic-locking-for-destroy' into 'master' | Stan Hu | 2016-12-01 | 2 | -7/+40 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Use Arel to avoid MySQL triple quotingfix-optimistic-locking-for-destroy | Lin Jen-Shin | 2016-12-01 | 1 | -2/+1 | |
| * | | | | | | | | | | | | Make deleting with optimistic locking respect NULL | Lin Jen-Shin | 2016-12-01 | 2 | -7/+41 | |
* | | | | | | | | | | | | | Merge branch '24669-merge-request-dashboard-page-takes-over-a-minute-to-load'... | Yorick Peterse | 2016-12-01 | 6 | -12/+40 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Fix have_issuable_counts matcher on failure24669-merge-request-dashboard-page-takes-over-a-minute-to-load | Sean McGivern | 2016-12-01 | 1 | -4/+4 | |
| * | | | | | | | | | | | | | Don't include ignored params in cache key | Sean McGivern | 2016-12-01 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | Add changelog entry | Sean McGivern | 2016-12-01 | 1 | -0/+4 | |
| * | | | | | | | | | | | | | Count all issuable states at once | Sean McGivern | 2016-12-01 | 2 | -6/+29 | |
| * | | | | | | | | | | | | | Save a query on issue and MR lists | Sean McGivern | 2016-12-01 | 2 | -2/+2 | |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'rescue-from-redis-init-errors' into 'master' | Stan Hu | 2016-12-01 | 2 | -1/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Gracefully recover from Redis connection failures in Sidekiq initializer | Stan Hu | 2016-12-01 | 2 | -1/+5 | |
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'use-st-commits-where-possible' into 'master' | Yorick Peterse | 2016-12-01 | 11 | -44/+73 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Replace references to MergeRequestDiff#commits with st_commitsuse-st-commits-where-possible | Adam Niedzielski | 2016-12-01 | 11 | -44/+73 | |
* | | | | | | | | | | | | | Merge branch 'docs/container-registry-2fa' into 'master' | Achilleas Pipinellis | 2016-12-01 | 3 | -21/+43 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Document the need to use a PAT with Registry when 2FA is on | Achilleas Pipinellis | 2016-12-01 | 3 | -21/+43 | |
* | | | | | | | | | | | | | Merge branch 'docs/fix-webhooks-headings' into 'master' | Achilleas Pipinellis | 2016-12-01 | 2 | -35/+46 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Small refactor of webhooks docs | Achilleas Pipinellis | 2016-12-01 | 2 | -35/+46 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'docs/triggers-ref-clarify' into 'master' | Achilleas Pipinellis | 2016-12-01 | 1 | -3/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Clarify that a commit SHA doesn't work for CI triggers | Achilleas Pipinellis | 2016-12-01 | 1 | -3/+7 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'docs/fix-typo-build-artifacts' into 'master' | Achilleas Pipinellis | 2016-12-01 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fix wrong link in builds artifacts admin docs | Achilleas Pipinellis | 2016-12-01 | 1 | -1/+1 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'rs-include-emailhelpers' into 'master' | Rémy Coutable | 2016-12-01 | 10 | -1/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Only include EmailHelpers in mailer specs and specs using themrs-include-emailhelpers | Robert Speicher | 2016-12-01 | 10 | -1/+16 | |
* | | | | | | | | | | | | Merge branch 'remove-order-dependency-in-label-finder-spec' into 'master' | Rémy Coutable | 2016-12-01 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Rename a label to fix an intermittently-failing spec | Nick Thomas | 2016-12-01 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Merge branch 'clean-up-jira-service' into 'master' | Sean McGivern | 2016-12-01 | 5 | -44/+61 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Refactor JiraService by moving code out of JiraService#execute methodclean-up-jira-service | Adam Niedzielski | 2016-12-01 | 5 | -44/+61 | |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'improve_oauth_user_error' into 'master' | Rémy Coutable | 2016-12-01 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Improve the `Gitlab::OAuth::User` error message | Drew Blessing | 2016-11-30 | 1 | -1/+1 | |
* | | | | | | | | | | | | Merge branch 'refactor-issuable-branch-chooser' into 'master' | Robert Speicher | 2016-12-01 | 2 | -24/+31 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Refactor branch chooser in issuable formrefactor-issuable-branch-chooser | Rémy Coutable | 2016-11-30 | 2 | -24/+31 | |
* | | | | | | | | | | | | Merge branch '23718/backup-rake-task-human-readable' into 'master' | Douwe Maan | 2016-12-01 | 4 | -8/+47 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Add Human Readable Timestamp to backup tar file | David Gerő | 2016-11-30 | 4 | -8/+47 | |
* | | | | | | | | | | | | | Merge branch '22719-provide-a-new-gitlab-workhorse-install-rake-task-similar-... | Robert Speicher | 2016-12-01 | 16 | -192/+662 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Move task helpers to a module22719-provide-a-new-gitlab-workhorse-install-rake-task-similar-to-gitlab-shell-install | Rémy Coutable | 2016-11-30 | 14 | -260/+262 | |
| * | | | | | | | | | | | | Add #run_command! to task helpers to raise a TaskFailedError if status is not 0 | Rémy Coutable | 2016-11-30 | 6 | -26/+246 | |
| * | | | | | | | | | | | | New `gitlab:workhorse:install` rake task | Rémy Coutable | 2016-11-30 | 9 | -47/+295 | |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'fix/git-access-wiki-when-repository-feature-disabled' into 'mas... | Sean McGivern | 2016-11-30 | 6 | -3/+57 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Add CHANGELOG entryfix/git-access-wiki-when-repository-feature-disabled | Douglas Barbosa Alexandre | 2016-11-30 | 1 | -0/+4 | |
| * | | | | | | | | | | | | Improve Gitlab::GitAccessWiki spec with download access checks | Douglas Barbosa Alexandre | 2016-11-30 | 1 | -0/+25 | |
| * | | | | | | | | | | | | Improve ProjectPolicy spec to check permissions when wiki is disabled | Douglas Barbosa Alexandre | 2016-11-30 | 1 | -2/+12 | |
| * | | | | | | | | | | | | Allow access to the wiki with git when repository feature disabled | Douglas Barbosa Alexandre | 2016-11-30 | 3 | -1/+16 | |
* | | | | | | | | | | | | | Merge branch '24710-fix-generic-commit-status-table-row' into 'master' | Fatih Acet | 2016-11-30 | 3 | -39/+56 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | add CHANGELOG.md entry for !781124710-fix-generic-commit-status-table-row | Mike Greiling | 2016-11-29 | 1 | -0/+4 | |
| * | | | | | | | | | | | | | collapse nested if statement | Mike Greiling | 2016-11-29 | 2 | -6/+4 | |
| * | | | | | | | | | | | | | remove redundant if statement | Mike Greiling | 2016-11-29 | 2 | -4/+0 | |
| * | | | | | | | | | | | | | reformat build duration and finish time to match /ci/builds/_build.html.haml | Mike Greiling | 2016-11-29 | 1 | -8/+12 | |
| * | | | | | | | | | | | | | reorder generic commit status columns to match build status partial | Mike Greiling | 2016-11-29 | 1 | -22/+29 | |
| * | | | | | | | | | | | | | fetch local parameters in _generic_commit_status.html.haml similar to how _bu... | Mike Greiling | 2016-11-29 | 1 | -8/+16 | |
* | | | | | | | | | | | | | | Merge branch 'autocomplete-stays-open' into 'master' | Fatih Acet | 2016-11-30 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | |