summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Disable new rules in haml_lintwinh-upgrade-haml_lintwinh2017-08-042-1/+16
* Upgrade haml_lint Gem to 0.26.0winh2017-08-042-5/+6
* Merge branch 'rs-minor-banzai-perf' into 'master'Douwe Maan2017-08-041-0/+2
|\
| * Don't bother going through an entire Banzai pipeline for empty textrs-minor-banzai-perfRobert Speicher2017-08-031-0/+2
|/
* Merge branch '34904-specific-async-script-loading-by-using-a-page-variable' i...Phil Hughes2017-08-0346-26/+92
|\
| * Resolve "Specific Async Script Loading by using a Page Variable"Tim Zallmann2017-08-0346-26/+92
|/
* Merge branch 'tc-no-todo-service-select-mysql' into 'master'Sean McGivern2017-08-038-22/+62
|\
| * Add workaround for UPDATE with subquery when using MySQLToon Claes2017-08-031-2/+11
| * Avoid plucking Todo ids and use sub-queries insteadToon Claes2017-08-037-20/+51
* | Merge branch 'winh-dropdown-mixin' into 'master'Annabel Dunstone Gray2017-08-034-64/+11
|\ \
| * | Use mixin for new dropdown styleWinnie Hellmann2017-08-034-64/+11
|/ /
* | Merge branch 'dev.referable-inspect' into 'master'Sean McGivern2017-08-032-0/+17
|\ \
| * | implement #inspect for all Referablesdev.referable-inspecthttp://jneen.net/2017-08-012-0/+17
* | | Merge branch '3686_make_tarball_download_url' into 'master'Rémy Coutable2017-08-034-5/+13
|\ \ \
| * | | fix #3686 make tarball download url to end with extensionhaseeb2017-08-034-5/+13
|/ / /
* | | Merge branch 'use-rspec-support-helper' into 'master'Rémy Coutable2017-08-0314-51/+15
|\ \ \
| * | | Don't include EmailHelpers manually, pick with rspecuse-rspec-support-helperLin Jen-Shin2017-08-0314-51/+15
* | | | Merge branch '35133_strip_newlines_from_ssh_keys' into 'master'Rémy Coutable2017-08-032-8/+9
|\ \ \ \
| * | | | fix #35133 strip new lines from ssh keyshaseeb2017-08-032-8/+9
|/ / / /
* | | | Merge branch 'reorganise-issues-indexes-for-sorting' into 'master'Sean McGivern2017-08-033-3/+51
|\ \ \ \
| * | | | Re-organise "issues" indexes for faster orderingreorganise-issues-indexes-for-sortingYorick Peterse2017-08-033-3/+51
* | | | | Merge branch 'fix-oauth-checkboxes' into 'master'Filipa Lacerda2017-08-033-0/+13
|\ \ \ \ \
| * | | | | Fixed sign-in restrictions buttons not toggling active statefix-oauth-checkboxesPhil Hughes2017-08-033-0/+13
* | | | | | Merge branch 'feature/migrate-count-commits-to-gitaly' into 'master'Robert Speicher2017-08-035-31/+57
|\ \ \ \ \ \
| * | | | | | Migrate Gitlab::Git::Repository#count_commits to Gitalyfeature/migrate-count-commits-to-gitalyAhmad Sherif2017-08-025-31/+57
* | | | | | | Merge branch 'merge-request-commits-background-migration' into 'master'Rémy Coutable2017-08-035-5/+388
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Migrate MR commits and diffs to new tablesmerge-request-commits-background-migrationSean McGivern2017-08-035-5/+388
* | | | | | | Merge branch 'patch-1' into 'master'Achilleas Pipinellis2017-08-031-31/+32
|\ \ \ \ \ \ \
| * | | | | | | Explicitly spell out where the API root isAJ Jordan2017-07-281-1/+2
| * | | | | | | Move API "basic usage" to be more visibleAJ Jordan2017-07-281-31/+31
* | | | | | | | Merge branch 'abuango-imap-doc-fix' into 'master'Achilleas Pipinellis2017-08-031-0/+14
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Update reply_by_email_postfix_setup.md, included starting courier-authdaemon ...Abubakar Ango2017-08-031-0/+14
|/ / / / / / /
* | | | | | | Merge branch '35232-next-unresolved' into 'master'Clement Ho2017-08-032-5/+9
|\ \ \ \ \ \ \
| * | | | | | | fix Jump to next discussion35232-next-unresolvedSimon Knox2017-07-272-5/+9
* | | | | | | | Merge branch 'winh-project-page-dropdown-style' into 'master'Annabel Dunstone Gray2017-08-034-3/+55
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Make dropdown style on project page consistentWinnie Hellmann2017-08-034-3/+55
|/ / / / / / /
* | | | | | | Merge branch '28472-ignore-auto-generated-mails' into 'master'Sean McGivern2017-08-038-26/+51
|\ \ \ \ \ \ \
| * | | | | | | Check against "Auto-Submitted: no" insteadLin Jen-Shin2017-08-031-2/+11
| * | | | | | | Don't send rejection mails for all auto-generated mails28472-ignore-auto-generated-mailsLin Jen-Shin2017-08-038-26/+42
* | | | | | | | Merge branch 'fix-gitaly-install' into 'master'Rémy Coutable2017-08-033-12/+17
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Don't call load_tasks as this would load the tasks twicefix-gitaly-installRémy Coutable2017-08-022-8/+8
| * | | | | | | Ensure we run installation Rake tasks in a clean env in TestEnvRémy Coutable2017-08-022-6/+11
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'dm-api-current-user' into 'master'Sean McGivern2017-08-032-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Do not validate CSRF token in API unless neededdm-api-current-userDouwe Maan2017-08-022-1/+3
* | | | | | | | Merge branch 'gitaly-test-mtime-check' into 'master'Rémy Coutable2017-08-032-1/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove test gitaly when older than version fileJacob Vosmaer (GitLab)2017-08-032-1/+21
|/ / / / / / / /
* | | | | | | | Merge branch 'sidebar-fly-out-sub-nav' into 'master'Filipa Lacerda2017-08-035-38/+335
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into sidebar-fly-out-sub-navsidebar-fly-out-sub-navPhil Hughes2017-08-021677-9482/+16762
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | stop mobile from showing the sub-itemsPhil Hughes2017-08-022-3/+51
| * | | | | | | | changed variable namesPhil Hughes2017-08-021-10/+10