summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'background-migrations' into 'master'30404-high-cpu-usage-on-mrs-with-large-diffsRémy Coutable2017-06-128-0/+322
|\
| * Add the ability to perform background migrationsYorick Peterse2017-06-128-0/+322
* | Merge branch 'retry-specs' into 'master'Robert Speicher2017-06-121-3/+2
|\ \
| * | Attempts to run RSpec tests twice (1 retry)retry-specsRémy Coutable2017-06-121-3/+2
* | | Merge branch 'fix/import-commit-status-issue' into 'master'Douwe Maan2017-06-121-1/+1
|\ \ \
| * | | ignore name validation on importingfix/import-commit-status-issueJames Lopez2017-06-121-1/+1
| |/ /
* | | Merge branch 'use-request-store-helper-instead-actual-code' into 'master'Douwe Maan2017-06-1210-82/+20
|\ \ \
| * | | Use :request_store hooks on specsuse-request-store-helper-instead-actual-codeOswaldo Ferreira2017-06-0910-82/+20
* | | | Merge branch 'gitlab-workhorse-2.1.1' into 'master'Douwe Maan2017-06-121-1/+1
|\ \ \ \
| * | | | Update gitlab-workhorse to v2.1.1Nick Thomas2017-06-091-1/+1
* | | | | Merge branch 'fix-zh_TW-00' into 'master'Douwe Maan2017-06-121-2/+2
|\ \ \ \ \
| * | | | | Fix a few translation for zh_TWfix-zh_TW-00Lin Jen-Shin2017-06-121-2/+2
* | | | | | Merge branch '33525-use-git-diff-instead-of-git-format-patch' into 'master'Robert Speicher2017-06-121-7/+3
|\ \ \ \ \ \
| * | | | | | Generate patch with git diff instead of git format-patch33525-use-git-diff-instead-of-git-format-patchRémy Coutable2017-06-091-7/+3
* | | | | | | Merge branch 'gitaly-0.11.2' into 'master'Stan Hu2017-06-121-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Use gitaly 0.11.2Jacob Vosmaer2017-06-121-1/+1
* | | | | | | | Merge branch 'master' into 'master'Rémy Coutable2017-06-121-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Doc: Add the need to upgrade to Go 1.8.3 in the 9.1->9.2 documentation as the...PAB2017-06-121-2/+2
|/ / / / / / / /
* | | | | | | | Merge branch 'operau2f' into 'master'Rémy Coutable2017-06-123-1/+54
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add test for u2f helper and changelog entryJonas Kalderstam2017-06-112-0/+53
| * | | | | | | Enable FIDO U2F on Opera browser, see http://caniuse.com/#feat=u2fJakub Kramarz2017-06-111-1/+1
* | | | | | | | Merge branch '33132-change-icon-color' into 'master'33363-user-customize-callout-has-no-top-margin-on-projects-pagePhil Hughes2017-06-122-5/+9
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Always render warnings icon in orangeFilipa Lacerda2017-06-122-5/+9
|/ / / / / / /
* | | | | | | Merge branch 'fall-back-to-gzip-when-missing-optional-deps' into 'master'Marin Jankovski2017-06-121-1/+10
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | fall back to gzip when zopfli compression is unavailablefall-back-to-gzip-when-missing-optional-depsMike Greiling2017-06-091-1/+10
* | | | | | | Merge branch '33003-avatar-in-project-api' into 'master'Rémy Coutable2017-06-124-0/+17
|\ \ \ \ \ \ \
| * | | | | | | Accept image for avatar in project APIvanadium232017-06-094-0/+17
* | | | | | | | Merge branch '31397-job-detail-real-time' into 'master'Phil Hughes2017-06-1236-313/+1171
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve Job detail view to make it refreshed in real-time instead of reloadingFilipa Lacerda2017-06-1236-313/+1171
|/ / / / / / / /
* | | | | | | | Merge branch 'rs-simplify-todo-count-spec' into 'master'Rémy Coutable2017-06-124-29/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Test todos_count_format helper at the correct level to improve speedrs-simplify-todo-count-specRobert Speicher2017-06-094-29/+14
* | | | | | | | | Merge branch 'disable-Style/PreferredHashMethods-cop' into 'master'Robert Speicher2017-06-121-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Disable the Style/PreferredHashMethods copdisable-Style/PreferredHashMethods-copRémy Coutable2017-06-091-1/+1
* | | | | | | | | | Merge branch 'unassign-default-dropdown-state' into 'master'Phil Hughes2017-06-121-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Changes default text to "Unassigned"unassign-default-dropdown-stateJacob Schatz2017-06-111-1/+1
* | | | | | | | | | | Merge branch 'sh-recaptcha-fix-try2' into 'master'Sean McGivern2017-06-123-1/+14
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Make sure reCAPTCHA configuration is loaded when spam checks are initiatedsh-recaptcha-fix-try2Stan Hu2017-06-103-1/+14
* | | | | | | | | | | Merge branch '32517-disable-hover-state' into 'master'Phil Hughes2017-06-122-5/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Only show hover state on links and buttonsFilipa Lacerda2017-06-122-5/+11
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '31349-navs-vue' into 'master'Phil Hughes2017-06-126-127/+133
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use vue files for navigation tabs and buttonsFilipa Lacerda2017-06-126-127/+133
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'patch-8' into 'master'Grzegorz Bizon2017-06-121-0/+20
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | doc: add example of scheduler whenElan Ruusamäe2017-06-121-0/+20
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'remove-dead-singular-assignee-code-in-boards' into 'master'Fatih Acet2017-06-101-3/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Remove dead singular assignee code in boardsremove-dead-singular-assignee-code-in-boardsEric Eastwood2017-06-091-3/+0
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sh-bump-oauth2-gem' into 'master'Robert Speicher2017-06-093-7/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Bump Faraday and dependent OAuth2 gem version to support no_proxy variableStan Hu2017-06-093-7/+11
* | | | | | | | | Merge branch '33208-singup-active-state-underline' into 'master'Clement Ho2017-06-092-0/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixes sign up active state underline misalignmentFrank Sierra2017-06-092-0/+6
|/ / / / / / / / /
* | | | | | | | | Merge branch 'bugfix/upgrade-ruby-parser' into 'master'Douwe Maan2017-06-092-4/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |