summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Make sure we're passing ASCII-8BIT to Gitaly42161-gitaly-commitservice-encoding-undefinedconversionerror-u-c124-from-utf-8-to-ascii-8bitLin Jen-Shin2018-01-233-2/+30
| | | | when counting commit count.
* Merge branch '42119-non-triggered' into 'master'Grzegorz Bizon2018-01-233-8/+27
|\ | | | | | | | | | | | | Resolve ""This job has not been triggered yet" after hitting "Retry"" Closes #42119 See merge request gitlab-org/gitlab-ce!16583
| * Improve copy for the pending state42119-non-triggeredFilipa Lacerda2018-01-222-3/+3
| |
| * Improve pending case testFilipa Lacerda2018-01-221-2/+2
| |
| * Adds information for pending stateFilipa Lacerda2018-01-222-6/+12
| |
| * Update testsFilipa Lacerda2018-01-191-2/+1
| |
| * Do not render non triggered empty state for pending jobsFilipa Lacerda2018-01-193-5/+19
| | | | | | | | Put back non triggered information
* | Merge branch ↵Robert Speicher2018-01-224-6/+28
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '40612-cannot-change-project-visibility-from-private-even-when-owner' into 'master' Resolve "Cannot change project visibility from Private (even when owner)" Closes #40612 See merge request gitlab-org/gitlab-ce!16595
| * | fix spacing and wrap method params in parensMike Greiling2018-01-221-3/+3
| | |
| * | remove redundant forked? checkMike Greiling2018-01-221-1/+1
| | |
| * | add test to can_change_visibility_level? methodMike Greiling2018-01-221-4/+14
| | |
| * | ensure fork_source returns nil when project is the root fork, add testsMike Greiling2018-01-222-0/+6
| | |
| * | add CHANGELOG.md entry for !1659540612-cannot-change-project-visibility-from-private-even-when-ownerMike Greiling2018-01-191-0/+6
| | |
| * | fix issue in which projects which have forks cannot be changed from private ↵Mike Greiling2018-01-191-1/+1
| | | | | | | | | | | | to public
* | | Merge branch 'fix-callback-alignments' into 'master'Jacob Schatz2018-01-221-5/+15
|\ \ \ | | | | | | | | | | | | | | | | Fix callback alignments See merge request gitlab-org/gitlab-ce!16596
| * | | Fix callback alignmentsfix-callback-alignmentsClement Ho2018-01-191-5/+15
| |/ /
* | | Merge branch 'fix-eslint-usercallout' into 'master'Jacob Schatz2018-01-221-1/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix eslint - UserCallout reference Closes #42298 See merge request gitlab-org/gitlab-ce!16630
| * | | Fix eslint UserCalloutfix-eslint-usercalloutClement Ho2018-01-221-1/+0
| | | |
* | | | Merge branch 'fix-postgresql-table-grant' into 'master'Stan Hu2018-01-222-20/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use has_table_privilege for TRIGGER on PostgreSQL Closes #38634 See merge request gitlab-org/gitlab-ce!16618
| * | | | Use has_table_privilege for TRIGGER on PostgreSQLfix-postgresql-table-grantYorick Peterse2018-01-222-20/+35
| | | | | | | | | | | | | | | | | | | | This fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/38634.
* | | | | Update CHANGELOG.md for 10.3.6Oswaldo Ferreira2018-01-221-0/+23
| | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'patch-28' into 'master'Stan Hu2018-01-221-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Update CHANGELOG.md See merge request gitlab-org/gitlab-ce!16628
| * | | | Update CHANGELOG.mdFrancisco Javier López2018-01-221-1/+1
|/ / / /
* | | | Merge branch 'add-profiler-to-application' into 'master'Stan Hu2018-01-225-11/+392
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add Gitlab::Profiler for profiling from a console or runner See merge request gitlab-org/gitlab-ce!16552
| * | | | Add bin/profile-url tool and docsadd-profiler-to-applicationSean McGivern2018-01-193-11/+94
| | | | |
| * | | | Add Gitlab::Profiler for profiling from a console or runnerSean McGivern2018-01-192-0/+298
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::Profiler.profile takes a URL to profile, and returns the ruby-prof profile result. This is currently only for interactive use (in a console) or from the script runner. Note that when using this interactively, changes to the application within that console session will be used, so this can be used to test proposed performance changes.
* | | | | Merge branch 'projects-r-s' into 'master'Jacob Schatz2018-01-229-38/+93
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | refactor for projects-r*, s* See merge request gitlab-org/gitlab-ce!16351
| * | | | | Fix eslintprojects-r-sClement Ho2018-01-191-2/+0
| | | | | |
| * | | | | Merge branch 'master' into projects-r-sClement Ho2018-01-19116-312/+970
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Add secretVariable testClement Ho2018-01-191-0/+6
| | | | | |
| * | | | | Fix eslintClement Ho2018-01-191-3/+1
| | | | | |
| * | | | | Merge branch 'master' into 'projects-r-s'Clement Ho2018-01-19103-2192/+2753
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/dispatcher.js
| * | | | | | Fix referenceClement Ho2018-01-181-2/+2
| | | | | | |
| * | | | | | Fix eslintClement Ho2018-01-185-16/+4
| | | | | | |
| * | | | | | Code improvementsClement Ho2018-01-188-25/+14
| | | | | | |
| * | | | | | [skip ci] Improve dispatcherClement Ho2018-01-181-10/+2
| | | | | | |
| * | | | | | Add rest of refactor of dispatcher for project:s*Jacob Schatz2018-01-184-23/+51
| | | | | | |
| * | | | | | Refactor for projects:sJacob Schatz2018-01-186-4/+53
| | | | | | |
| * | | | | | refactor for projects-r*Jacob Schatz2018-01-182-2/+10
| | | | | | |
* | | | | | | Merge branch 'sh-fix-error-500-no-avatars' into 'master'Robert Speicher2018-01-223-1/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when repository has no avatar Closes #42249 See merge request gitlab-org/gitlab-ce!16601
| * | | | | | | Fix Error 500 when repository has no avatarsh-fix-error-500-no-avatarsStan Hu2018-01-203-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #42249
* | | | | | | | Merge branch '40029-better-error-handling-on-issuable-templates' into 'master'Clement Ho2018-01-222-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loading spinner not stop even on errors in the Issuable Templates Closes #40029 See merge request gitlab-org/gitlab-ce!16600
| * | | | | | | | Stop loading spinner on error of issuable templatesTakuya Noguchi2018-01-212-1/+6
| |/ / / / / / /
* | | | | | | | Merge branch 'gitlab-shell-6.0.2' into 'master'Robert Speicher2018-01-221-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gitlab-shell 6.0.2 See merge request gitlab-org/gitlab-ce!16612
| * | | | | | | | Use gitlab-shell 6.0.2gitlab-shell-6.0.2Jacob Vosmaer2018-01-221-1/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'workhorse-3.5.1' into 'master'Robert Speicher2018-01-221-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gitlab-workhorse 3.5.1 See merge request gitlab-org/gitlab-ce!16588
| * | | | | | | | Use gitlab-workhorse 3.5.1workhorse-3.5.1Jacob Vosmaer2018-01-221-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'gitaly-git-http-ssh' into 'master'Douwe Maan2018-01-224-36/+31
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default to Gitaly for 'git push' HTTP/SSH, and make Gitaly mandatory for SSH pull See merge request gitlab-org/gitlab-ce!16586
| * | | | | | | | | Default to Gitaly for 'git push' HTTP/SSH, and make Gitaly mandatory for SSH ↵Jacob Vosmaer (GitLab)2018-01-224-36/+31
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | pull
* | | | | | | | | Merge branch 'bvl-parent-preloading' into 'master'Douwe Maan2018-01-226-14/+102
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix filtering projects & groups on group pages Closes #40785 See merge request gitlab-org/gitlab-ce!16584
View Lorry Controller Status