summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add multiple assignees migration and table populationOswaldo Ferreira2019-03-2510-1/+242
| | | | This will be further required for supporting multi-assignees MRs
* 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
| * | | | Add end-of-string to regex exampleEvan Read2019-03-221-2/+2
|/ / / /
* | | | Merge branch 'docs-cleanup-fe' into 'master'Filipa Lacerda2019-03-2211-104/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Docs cleanup fe See merge request gitlab-org/gitlab-ce!26158
| * | | | Cleanup of fe_docsSimon Knox2019-03-2211-104/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start moving back to regular fe_docs Remove Initiatives, add section to index in fe_guide Delete some no-longer-relevant parts from principles Update title - Progressive Enchancement is a browser-support term and could be confused "When to use" parts are discussed elswhere Vue & jQuery issue is no longer relevant Delete duplicate Security docs Remove empty files, move event_tracking Shuffle index sections around Remove sections on Vue & Webpack (we say same thing in prev paragraph) Remove link to Droplab docs
* | | | | Merge branch 'tpresa-add-highest-role-to-user' into 'master'Sean McGivern2019-03-2210-2/+120
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add highest_role method to User See merge request gitlab-org/gitlab-ce!25462
| * | | | | Add highest_role method to UserThiago Presa2019-03-2210-2/+120
|/ / / / /
* | | | | Merge branch '57540-filename-trailing-space' into 'master'Tim Zallmann2019-03-223-1/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented trimming for item's name in Web IDE Closes #57540 See merge request gitlab-org/gitlab-ce!26270
| * | | | | Implemented trimming for item's name in Web IDEDenys Mishunov2019-03-183-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/57540
* | | | | | Merge branch 'winh-jest-time' into 'master'Kushal Pandya2019-03-222-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mock and wait for timers in Jest Closes #56056 See merge request gitlab-org/gitlab-ce!26433
| * | | | | | Delete dummy testWinnie Hellmann2019-03-211-7/+0
| | | | | | |
| * | | | | | Wait for pending timers in JestWinnie Hellmann2019-03-211-0/+5
| | | | | | |
| * | | | | | Mock timers in JestWinnie Hellmann2019-03-211-0/+1
| | | | | | |
| * | | | | | Add dummy test with setTimeout()Winnie Hellmann2019-03-211-0/+7
| | | | | | |
* | | | | | | Merge branch '57357-automate-base-domain-help-text' into 'master'Kushal Pandya2019-03-226-5/+111
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automate base domain help text on Clusters page Closes #57357 See merge request gitlab-org/gitlab-ce!26124
| * | | | | | | Add changelog entryEnrique Alcantara2019-03-211-0/+5
| | | | | | | |
| * | | | | | | Update domain help text when ingress is installedEnrique Alcantara2019-03-214-2/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When ingress application is installed, the cluster domain help text is updated to indicate that ingress external ip can be used as the cluster domain
| * | | | | | | Hide/show ingress external ip help textEnrique Alcantara2019-03-212-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use not_to instead of to__not
* | | | | | | | Merge branch 'winh-toggle-comment-draft' into 'master'Kushal Pandya2019-03-227-32/+234
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display draft when toggling replies Closes #48211 and #56364 See merge request gitlab-org/gitlab-ce!25563
| * | | | | | | | Remove autosave logic from NoteableDiscussion componentWinnie Hellmann2019-03-211-17/+4
| | | | | | | | |
| * | | | | | | | Pass autosaveKey from NoteableDiscussion to NoteFormWinnie Hellmann2019-03-214-0/+16
| | | | | | | | |
| * | | | | | | | Validate NoteForm props in noteable_discussion_spec.jsWinnie Hellmann2019-03-211-1/+12
| | | | | | | | |
| * | | | | | | | Use autosave utilities in NoteForm componentWinnie Hellmann2019-03-212-9/+106
| | | | | | | | |
| * | | | | | | | Add autosave utilitiesWinnie Hellmann2019-03-122-0/+91
| | | | | | | | |
| * | | | | | | | Rename initialDiscussion to firstNote in NoteableDiscussionWinnie Hellmann2019-03-121-7/+7
| | | | | | | | |
* | | | | | | | | Merge branch 'da-capitalize-db-apapter-name-on-rails-console' into 'master'Stan Hu2019-03-225-6/+22
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display the database adapter name in a human-friendly way See merge request gitlab-org/gitlab-ce!26437
| * | | | | | | | | Add helper method to return a human-friendly name for database adapterDouglas Barbosa Alexandre2019-03-215-6/+22
| | | | | | | | | |
* | | | | | | | | | Merge branch 'docs/edit-youtrack-docs' into 'master'Mike Lewis2019-03-224-20/+25
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve Youtrack documentation for style See merge request gitlab-org/gitlab-ce!26457
View Lorry Controller Status