summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge branch 'fixed-duplicated-large-text-on-diffs' into 'master'Filipa Lacerda2019-04-034-12/+8
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes duplicate diff too large error messages Closes #59802 See merge request gitlab-org/gitlab-ce!26857
| * | | | | | | | | | | Fixes duplicate diff too large error messagesPhil Hughes2019-04-024-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59802
* | | | | | | | | | | | Merge branch 'leipert-resolve-fe-dependency-conflict-ce' into 'master'Filipa Lacerda2019-04-032-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve CE/EE difference in FE dependency files See merge request gitlab-org/gitlab-ce!26856
| * | | | | | | | | | | | Resolve CE/EE difference in FE dependency filesleipert-resolve-fe-dependency-conflict-ceLukas Eipert2019-04-022-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This resolved the one conflict we have in CE/EE.
* | | | | | | | | | | | | Merge branch 'gl-set-up-gitlab-ui-danger-reviewer' into 'master'Tim Zallmann2019-04-033-1/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set specific reviewers for the GitLab UI WG effort See merge request gitlab-org/gitlab-ce!26760
| * | | | | | | | | | | | | Set specific reviewers for the GitLab UI WG effortgl-set-up-gitlab-ui-danger-reviewerFilipa Lacerda2019-03-293-1/+59
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '47771-highlighting-in-diff' into 'master'Tim Zallmann2019-04-032-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabled text selection in diffs in Web IDE Closes #47771 See merge request gitlab-org/gitlab-ce!26721
| * | | | | | | | | | | | | | Enabled text selection in diffs in Web IDE47771-highlighting-in-diffDenys Mishunov2019-03-282-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/47771 Changelog entry
* | | | | | | | | | | | | | | Merge branch 'patch-49' into 'master'Phil Hughes2019-04-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix comment typo in noteable_note.vue See merge request gitlab-org/gitlab-ce!26855
| * | | | | | | | | | | | | | Fix comment typoSergiu Marton2019-04-021-1/+1
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'patch-49' into 'master'Evan Read2019-04-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove html tag See merge request gitlab-org/gitlab-ce!26885
| * | | | | | | | | | | | | remove html tagWilliam Chia2019-04-021-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'docs/ci-refs-at-symbol' into 'master'Evan Read2019-04-031-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document matching refs with an at-symbol See merge request gitlab-org/gitlab-ce!26755
| * | | | | | | | | | | | | | Document matching refs with an at-symbolCody Mize2019-04-031-0/+5
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At-symbols are used to match a ref to a specific repository path. Currently this is done by string splitting the ref pattern on the at-symbol. In order to pattern match a literal `@` you must use ruby's unicode character matching `\u{0040}`.
* | | | | | | | | | | | | | Merge branch 'fix-format-typo-two-factor-auth' into 'master'Evan Read2019-04-031-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix format typo on generate-new-recovery-codes-using-ssh See merge request gitlab-org/gitlab-ce!26819
| * | | | | | | | | | | | | | Fix format typo on generate-new-recovery-codes-using-sshAgustin Henze2019-04-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rendering is broken and it's confusing when you are reading the doc about generate the recovery codes using ssh. Signed-off-by: Agustin Henze <tin@redhat.com>
* | | | | | | | | | | | | | | Merge branch 'doc/fix-typo-on-tests-style-guide' into 'master'Sanad Liaquat2019-04-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo on tests style guide See merge request gitlab-org/gitlab-ce!26859
| * | | | | | | | | | | | | | Fix typo on tests style guidedoc/fix-typo-on-tests-style-guideWalmyr Lima2019-04-021-1/+1
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '59131-set-the-size-of-instance-system-message-text-12px' into ↵Mike Greiling2019-04-023-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Set the size of instance system message text 12px" Closes #59131 See merge request gitlab-org/gitlab-ce!26293
| * | | | | | | | | | | | | | Remove duplicate declaration of $system-header-height59131-set-the-size-of-instance-system-message-text-12pxDennis Tang2019-04-021-1/+0
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Update system message banner font size to 12pxDennis Tang2019-04-022-0/+6
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'renovate/gitlab-svgs-1.x' into 'master'Clement Ho2019-04-022-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/svgs to ^1.58.0 See merge request gitlab-org/gitlab-ce!26881
| * | | | | | | | | | | | | Update dependency @gitlab/svgs to ^1.58.0Lukas 'Eipi' Eipert2019-04-022-5/+5
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'qa-increase-depth-of-review-deploy-job' into 'master'Douglas Barbosa Alexandre2019-04-021-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the default fetch/clone depth for the review-deploy job See merge request gitlab-org/gitlab-ce!26868
| * | | | | | | | | | | | | | Use the default fetch/clone depth for the review-deploy jobqa-increase-depth-of-review-deploy-jobRémy Coutable2019-04-021-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | Merge branch '55980-remove-add-issue-on-blank-list' into 'master'Clement Ho2019-04-024-2/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove non-functional add issue button on welcome list Closes #55980 See merge request gitlab-org/gitlab-ce!26742
| * | | | | | | | | | | | | | | Remove non-functional add issue button on welcome listDonald Cook2019-04-024-2/+24
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'revert-a3fd1a13' into 'master'Robert Speicher2019-04-024-84/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Monitor GraphQL with Prometheus" See merge request gitlab-org/gitlab-ce!26864
| * | | | | | | | | | | | | | Revert "Merge branch 'jprovazn-graphql-prometheus' into 'master'"Jan Provaznik2019-04-024-84/+0
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !26569
* | | | | | | | | | | | | | Merge branch 'docs-revamp-ci-variables' into 'master'Marcia Ramos2019-04-026-236/+376
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: revamp/reorg CI variables Closes #58626 See merge request gitlab-org/gitlab-ce!26336
| * | | | | | | | | | | | | Add screenshots for variablesMarcia Ramos2019-04-026-236/+376
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Variables overview - Variables triggered via manual pipeline
* | | | | | | | | | | | | Merge branch 'if-53411-remove_ignore_column' into 'master'Kamil Trzciński2019-04-021-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove ignore column for PersonalAccessToken#token Closes #53411 See merge request gitlab-org/gitlab-ce!25213
| * | | | | | | | | | | | | Remove ignore column for PersonalAccessToken#tokenImre Farkas2019-04-021-2/+0
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'ce-8317-operations-dashboard-usage-ping' into 'master'Douglas Barbosa Alexandre2019-04-021-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add dashboard scope for operations dashboard usage ping See merge request gitlab-org/gitlab-ce!26727
| * | | | | | | | | | | | Add with_dashboard scope to Userce-8317-operations-dashboard-usage-pingLogan King2019-03-221-0/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'ce-reduce-diff-in-spec-models' into 'master'Lin Jen-Shin2019-04-025-7/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE] Reduce diff with EE in `spec/models` See merge request gitlab-org/gitlab-ce!26847
| * | | | | | | | | | | | | [CE] Reduce diff with EE in spec/models/project_wiki_spec.rbce-reduce-diff-in-spec-modelsRémy Coutable2019-04-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | | [CE] Reduce diff with EE in spec/models/project_team_spec.rbRémy Coutable2019-04-021-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | | [CE] Reduce diff with EE in spec/models/project_spec.rbRémy Coutable2019-04-021-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | | [CE] Reduce diff with EE in spec/models/environment_spec.rbRémy Coutable2019-04-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | | [CE] Reduce diff with EE in spec/models/concerns/prometheus_adapter_spec.rbRémy Coutable2019-04-021-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | Merge branch ↵Lin Jen-Shin2019-04-021-38/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ce-6119-extract-ee-specific-files-lines-for-spec-services-groups' into 'master' Remove groups destroy race condition spec See merge request gitlab-org/gitlab-ce!26851
| * | | | | | | | | | | | | Remove groups destroy race condition specce-6119-extract-ee-specific-files-lines-for-spec-services-groupsSean McGivern2019-04-021-38/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was removed in the below MR in EE only, as it was causing failures related to Geo. https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3999
* | | | | | | | | | | | | | Merge branch 'sh-cache-pipeline-find-commits' into 'master'Kamil Trzciński2019-04-023-4/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache FindCommit results in pipelines view See merge request gitlab-org/gitlab-ce!26776
| * | | | | | | | | | | | | Cache FindCommit results in pipelines viewsh-cache-pipeline-find-commitsStan Hu2019-04-023-4/+17
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For each pipeline, the controller will call `Pipeline#latest?` to determine if the pipeline's ref is the latest for that branch. Since it's likely that the same branches are being used in each pipeline, we can reduce Gitaly overhead by caching the results of the FindCommit call.
* | | | | | | | | | | | | Merge branch 'docs-image-realignment' into 'master'11-10-stable-prepare-rc1Achilleas Pipinellis2019-04-0235-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: image realignment See merge request gitlab-org/gitlab-ce!26799
| * | | | | | | | | | | | | Docs: image realignmentMarcel Amirault2019-04-0235-0/+0
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'docs-move-variables-ref-to-new-doc' into 'master'Achilleas Pipinellis2019-04-022-101/+111
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: move variables reference to its own doc See merge request gitlab-org/gitlab-ce!26763
| * | | | | | | | | | | | | Fix conflicts with masterMarcia Ramos2019-04-022-101/+111
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull master
* | | | | | | | | | | | | Merge branch 'jv-gitaly-unlink-repository' into 'master'Grzegorz Bizon2019-04-025-19/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop calling UnlinkRepositoryFromObjectPool RPC Closes #59777 See merge request gitlab-org/gitlab-ce!26821
View Lorry Controller Status