summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Removes EE differences for lists.scssFilipa Lacerda2019-03-221-0/+6
| |/ / / / /
* | | | | | Merge branch '10597-select-css' into 'master'Phil Hughes2019-03-251-0/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for selects.scss Closes gitlab-ee#10597 See merge request gitlab-org/gitlab-ce!26472
| * | | | | | Removes EE differences for selects.scssFilipa Lacerda2019-03-221-0/+10
| |/ / / / /
* | | | | | Merge branch '48297-fix-code-selection' into 'master'Phil Hughes2019-03-252-2/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Code in other column of side-by-side diff is highlighted when selecting code on one side" Closes #48297 See merge request gitlab-org/gitlab-ce!26423
| * | | | | | Resolve "Code in other column of side-by-side diff is highlighted when ↵Natalia Tepluhina2019-03-252-2/+8
|/ / / / / / | | | | | | | | | | | | | | | | | | selecting code on one side"
* | | | | | Merge branch '10539-variables-scss' into 'master'Phil Hughes2019-03-251-0/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for variables.scss Closes gitlab-ee#10539 See merge request gitlab-org/gitlab-ce!26361
| * | | | | | Removes EE differences for variables.scssFilipa Lacerda2019-03-201-0/+28
| | | | | | |
* | | | | | | Merge branch 'renovate/gitlab-ui-2.x' into 'master'Phil Hughes2019-03-252-5/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/ui to ^2.4.1 See merge request gitlab-org/gitlab-ce!26380
| * | | | | | | Update dependency @gitlab/ui to ^2.4.1Lukas 'Eipi' Eipert2019-03-202-5/+5
| | | | | | | |
* | | | | | | | Merge branch '10538-avatar-css' into 'master'Phil Hughes2019-03-251-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removes ee differences for avatar.scss Closes gitlab-ee#10538 See merge request gitlab-org/gitlab-ce!26360
| * | | | | | | | Removes ee differences for avatar.scssFilipa Lacerda2019-03-201-0/+4
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch '10535-buttons-css' into 'master'Phil Hughes2019-03-251-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for buttons.scss Closes gitlab-ee#10535 See merge request gitlab-org/gitlab-ce!26358
| * | | | | | | | Removes EE differences for buttons.scssFilipa Lacerda2019-03-211-1/+2
| | | | | | | | |
* | | | | | | | | Merge branch 'ce-56153-error-tracking-counts' into 'master'Dmitriy Zaporozhets2019-03-253-0/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add error tracking usage counts See merge request gitlab-org/gitlab-ce!25472
| * | | | | | | | | Add error tracking usage countsLogan King2019-03-253-0/+10
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs-junit-report-paths-matching' into 'master'Evan Read2019-03-251-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct JUnit report path pattern matching description See merge request gitlab-org/gitlab-ce!26215
| * | | | | | | | | Correct Gradle files pattern matching description and exampleNate Liu2019-03-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `junit` files pattern matching should be globbing instead of regex.
* | | | | | | | | | Merge branch 'docs/fix-emoji-images' into 'master'Evan Read2019-03-251-5/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Emoji URLs Closes #59139 See merge request gitlab-org/gitlab-ce!26298
| * | | | | | | | | | Fix Emoji URLsDavid Coy2019-03-251-5/+5
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs-anchors13-misc' into 'master'Evan Read2019-03-2516-28/+25
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Fix missed or newly added broken anchors See merge request gitlab-org/gitlab-ce!25997
| * | | | | | | | | | Docs: Fix missed or newly added broken anchorsMarcel Amirault2019-03-2516-28/+25
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs-anchors7-issues' into 'master'Evan Read2019-03-257-41/+34
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Fixing anchors and links for all docs related to issues. See merge request gitlab-org/gitlab-ce!25516
| * | | | | | | | | | Docs: Fixing anchors and links for all docs related to issues.Marcel Amirault2019-03-257-41/+34
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs/add-instance-level-templates' into 'master'Evan Read2019-03-241-0/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add instance level templates to the examples page. See merge request gitlab-org/gitlab-ce!25927
| * | | | | | | | | | Add instance level templates to the examples page.Brendan O'Leary 🐢2019-03-241-0/+4
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs/fix-link-to-personas' into 'master'Evan Read2019-03-241-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix link to personas UX guide See merge request gitlab-org/gitlab-ce!26478
| * | | | | | | | | Fix link to personas UX guideAchilleas Pipinellis2019-03-221-2/+2
| | | | | | | | | |
* | | | | | | | | | Merge branch 'move-details-of-e2e-tests-to-the-bottom' into 'master'53404-serverless-function-time-series-for-k8s-podMark Lapierre2019-03-221-9/+9
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move details of e2e tests to the bottom See merge request gitlab-org/gitlab-ce!26494
| * | | | | | | | | | Move details of e2e tests to the bottomWalmyr Lima2019-03-221-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code should be written like a newspaper, wherein the top we have more high level information, and as we go down we have more details. So I'm moving the implementation details to the bottom to make the test easier to read.
* | | | | | | | | | | Merge branch 'retain-default-branch-on-import' into 'master'Stan Hu2019-03-223-1/+31
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set proper default-branch on GitHub Import Closes #59347 See merge request gitlab-org/gitlab-ce!26476
| * | | | | | | | | | | Set proper default-branch on GitHub ImportKamil Trzciński2019-03-223-1/+31
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'refresh-commit-count-after-head-change' into 'master'Stan Hu2019-03-224-0/+13
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refresh commit count after repository head changes Closes #59346 See merge request gitlab-org/gitlab-ce!26473
| * | | | | | | | | | | Refresh commit count after repository head changesKamil Trzciński2019-03-224-0/+13
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '46787-create-project-label-window-is-cut-off-at-the-bottom' ↵Annabel Dunstone Gray2019-03-222-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve ""Create project label" window is cut off at the bottom" Closes #46787 See merge request gitlab-org/gitlab-ce!26049
| * | | | | | | | | | | Reset maximum height for create label dropdownConstance Okoghenun2019-03-222-1/+6
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch ↵Lin Jen-Shin2019-03-222-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ce-6517-extract-ee-specific-files-lines-for-spec-services-emails' into 'master' Freeze strings in email service specs See merge request gitlab-org/gitlab-ce!26485
| * | | | | | | | | | | Freeze strings in email service specsSean McGivern2019-03-222-0/+4
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'ce-extract-ee-specific-lines-environment-entity' into 'master'Yorick Peterse2019-03-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract EE specific files/lines for Release app/serializers See merge request gitlab-org/gitlab-ce!26087
| * | | | | | | | | | | Extract EE specific files/lines for Release app/serializersShinya Maeda2019-03-221-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'sh-bump-pg-gem' into 'master'James Lopez2019-03-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump pg gem from 1.1.3 to 1.1.4 See merge request gitlab-org/gitlab-ce!26471
| * | | | | | | | | | | | Bump pg gem from 1.1.3 to 1.1.4Stan Hu2019-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This keeps the version used by gitlab-monitor and GitLab CE consistent. This release also adds Ruby 2.6 support and PostgreSQL 11 error codes: https://github.com/ged/ruby-pg/blob/master/History.rdoc
* | | | | | | | | | | | | Merge branch 'revert-79a45f7f' into 'master'Sean McGivern2019-03-22104-146/+148
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'winh-remove-sushi' into 'master'" See merge request gitlab-org/gitlab-ce!26470
| * | | | | | | | | | | | Revert "Merge branch 'winh-remove-sushi' into 'master'"Filipa Lacerda2019-03-22104-146/+148
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | This reverts merge request !26430
* | | | | | | | | | | | Merge branch ↵Robert Speicher2019-03-2211-617/+662
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ce-6618-extract-ee-specific-files-lines-for-create-spec-finders' into 'master' [CE] Extract EE specific files/lines from spec/finders Closes gitlab-ee#10142 and gitlab-ee#10141 See merge request gitlab-org/gitlab-ce!26337
| * | | | | | | | | | | [CE] Reduce differences with EE in users_finder_spec.rbRémy Coutable2019-03-214-49/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | [CE] Reduce differences with EE in snippets_finder_spec.rbRémy Coutable2019-03-213-449/+416
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | [CE] Reduce differences with EE in merge_requests_finder_spec.rbRémy Coutable2019-03-212-93/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | [CE] Reduce differences with EE in issues_finder_spec.rbRémy Coutable2019-03-212-37/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | [CE] Reduce differences with EE in group_projects_finder_spec.rbRémy Coutable2019-03-212-20/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | Merge branch 'docs/improve-regex-suggestion' into 'master'Achilleas Pipinellis2019-03-221-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add end-of-string to regex example Closes #58031 See merge request gitlab-org/gitlab-ce!26302