summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Adds correct illustration for pending state42220-add-pending-empty-stateFilipa Lacerda2018-01-236-7/+13
|
* Merge branch '131-qa-api-driver' into 'master'Grzegorz Bizon2018-01-2318-24/+420
|\ | | | | | | | | Add ability to drive the API in QA specs See merge request gitlab-org/gitlab-ce!16265
| * Add ability to drive the API in QA specsBrett Walker2018-01-2318-24/+420
|/
* Merge branch 'tz-upgrade-vue-again' into 'master'Filipa Lacerda2018-01-2317-64/+78
|\ | | | | | | | | Upgraded all vue libraries See merge request gitlab-org/gitlab-ce!16413
| * Upgraded all vue librariesTim Zallmann2018-01-2317-64/+78
| |
* | Merge branch 'gitaly-update-remote-mirror' into 'master'Rémy Coutable2018-01-233-5/+60
|\ \ | | | | | | | | | | | | | | | | | | Incorporate Gitaly's RemoteService.UpdateRemoteMirror RPC Closes gitaly#936 See merge request gitlab-org/gitlab-ce!16536
| * | Incorporate Gitaly's RemoteService.UpdateRemoteMirror RPCgitaly-update-remote-mirrorAlejandro Rodríguez2018-01-224-6/+61
| | |
* | | Merge branch 'gitaly-user-commit-files' into 'master'Douwe Maan2018-01-2310-41/+165
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Incorporate Gitaly's OperationService.UserCommitFiles RPC Closes gitaly#890 See merge request gitlab-org/gitlab-ce!16307
| * | Incorporate Gitaly's OperationService.UserCommitFiles RPCgitaly-user-commit-filesAlejandro Rodríguez2018-01-227-37/+152
| | |
| * | Ensure hooks are deleted regardless of the project forking methodAlejandro Rodríguez2018-01-193-4/+13
| | |
* | | Merge branch 'add-js-note-live-debug' into 'master'Rémy Coutable2018-01-231-0/+2
|\ \ \ | | | | | | | | | | | | | | | | Add note about live_debug only working on javascript enabled specs See merge request gitlab-org/gitlab-ce!16625
| * | | Add note about live_debug only working on javascript enabled specsadd-js-note-live-debugClement Ho2018-01-221-0/+2
| | | |
* | | | Merge branch 'fl-update-svg' into 'master'Tim Zallmann2018-01-238-9/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Backport for Resolve "change status icon for reports when fails to be found or cannot load" See merge request gitlab-org/gitlab-ce!16616
| * | | | Backport for Resolve "change status icon for reports when fails to be found ↵Filipa Lacerda2018-01-238-9/+12
|/ / / / | | | | | | | | | | | | or cannot load"
* | | | Merge branch 'docs/rs-archive-more-changelogs' into 'master'Rémy Coutable2018-01-232-3249/+3249
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Archive changelogs for versions before 8.16 See merge request gitlab-org/gitlab-ce!16624
| * | | | Archive changelogs for versions before 8.16docs/rs-archive-more-changelogsRobert Speicher2018-01-222-3249/+3249
| | | | |
* | | | | 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
| | | | | | | |
View Lorry Controller Status