summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | Based on MR simplified the logicTim Zallmann2017-10-093-17/+5
| | | | | | | | | | | |
| * | | | | | | | | | | Removed 2 uncommented linesTim Zallmann2017-10-061-2/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed Linting ErrorTim Zallmann2017-10-051-8/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Another Change for cleanupTim Zallmann2017-10-051-6/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Updates based on MR commentsTim Zallmann2017-10-053-16/+19
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed TestsTim Zallmann2017-10-043-8/+9
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed TestTim Zallmann2017-10-042-5/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed Linting errors + testsTim Zallmann2017-10-044-14/+13
| | | | | | | | | | | |
| * | | | | | | | | | | Created group_icon and group_icon_urlTim Zallmann2017-10-0412-17/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests for these new helper methods
| * | | | | | | | | | | Making private project avatars use local paths + Some Group IconsTim Zallmann2017-10-044-9/+27
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '38941-lock-note-fix' into 'master'Sean McGivern2017-10-103-3/+41
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix text for the merge request lock system note Closes #38941 See merge request gitlab-org/gitlab-ce!14779
| * | | | | | | | | | | | Fix text for the merge request lock system noteJarka Kadlecova2017-10-103-3/+41
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'acet-fix-paste-on-comment-form' into 'master'Filipa Lacerda2017-10-101-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trigger change event of the markdown textarea to allow Vue catch the programmatic changes. Closes #38441 See merge request gitlab-org/gitlab-ce!14539
| * | | | | | | | | | | | | Trigger change event of the markdown textarea to allow Vue catch the ↵acet-fix-paste-on-comment-formFatih Acet2017-09-271-1/+4
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | programmatic changes.
* | | | | | | | | | | | | Merge branch 'fix-timestampz-cop' into 'master'Grzegorz Bizon2017-10-106-7/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also warn on timestamp in datetime migration cop See merge request gitlab-org/gitlab-ce!14784
| * | | | | | | | | | | | | Ignore existing Migration/Datetime cop offendersSean McGivern2017-10-104-0/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Also warn on timestamp in datetime migration copfix-timestampz-copSean McGivern2017-10-102-7/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The types `timestamp` and `datetime` are aliases: https://github.com/rails/rails/blob/v4.2.10/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb#L362-L364
* | | | | | | | | | | | | | Merge branch '38869-ci-global' into 'master'Phil Hughes2017-10-1010-121/+110
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Build code from global namespace See merge request gitlab-org/gitlab-ce!14744
| * | | | | | | | | | | | | Remove Build code from global namespaceFilipa Lacerda2017-10-1010-121/+110
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'feature/migrate-workhorse-send-git-diff-patch-to-gitaly' into ↵Robert Speicher2017-10-103-22/+92
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Migrate Workhorse Send{Diff,Patch} to Gitaly See merge request gitlab-org/gitlab-ce!14652
| * | | | | | | | | | | | Migrate Workhorse Send{Diff,Patch} to Gitalyfeature/migrate-workhorse-send-git-diff-patch-to-gitalyAhmad Sherif2017-10-093-22/+92
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'ee-38771-ce-backport' into 'master'Douwe Maan2017-10-105-2/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backports EE 38771 changes to CE. See merge request gitlab-org/gitlab-ce!14782
| * | | | | | | | | | | | Backports EE 38771 changes to CE.Tiago Botelho2017-10-105-2/+52
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '38869-api' into 'master'Phil Hughes2017-10-101-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Api from main.js See merge request gitlab-org/gitlab-ce!14774
| * | | | | | | | | | | | Remove Api from main.js38869-apiFilipa Lacerda2017-10-091-1/+0
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'winh-clarify-naming-imports-docs' into 'master'Filipa Lacerda2017-10-101-4/+26
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make naming imports more clear Closes #38795 See merge request gitlab-org/gitlab-ce!14761
| * | | | | | | | | | | Make naming imports more clearwinh-clarify-naming-imports-docswinh-clarify-naming-importsWinnie Hellmann2017-10-091-4/+26
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch ↵Tim Zallmann2017-10-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '38574-superfluous-export-in-advanced-settings-of-project-settings' into 'master' Resolve "Superfluous "Export" in "Advanced settings" of project settings" Closes #38574 See merge request gitlab-org/gitlab-ce!14773
| * | | | | | | | | | | | fix incorrect description for advanced settings section of project settings38574-superfluous-export-in-advanced-settings-of-project-settingsMike Greiling2017-10-091-1/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '34841-todos' into 'master'Phil Hughes2017-10-105-52/+69
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bad type checking to prevent 0 count badge to be shown Closes #34841 See merge request gitlab-org/gitlab-ce!14767
| * | | | | | | | | | | Fix bad type checking to prevent 0 count badge to be shownFilipa Lacerda2017-10-105-52/+69
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'wiki-empty-page-heading' into 'master'Filipa Lacerda2017-10-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wiki empty page translation namespace not being removed Closes #38920 See merge request gitlab-org/gitlab-ce!14759
| * | | | | | | | | | | Fix wiki empty page translation namespace not being removedwiki-empty-page-headingPhil Hughes2017-10-091-1/+1
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #38920
* | | | | | | | | | | Merge branch 'rc/rename-codeclimate-to-codequality' into 'master'Kamil Trzciński2017-10-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the `codeclimate` job to `codequality` See merge request gitlab-org/gitlab-ce!14766
| * | | | | | | | | | | Rename the `codeclimate` job to `codequality`rc/rename-codeclimate-to-codequalityRémy Coutable2017-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per our documentation: https://docs.gitlab.com/ee/user/project/merge_requests/code_quality_diff.html#how-it-works Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | Merge branch '34284-add-changes-to-issuable-webhook-data' into 'master'Douwe Maan2017-10-0922-137/+659
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include the changes in issuable webhook payloads Closes #34284 See merge request gitlab-org/gitlab-ce!14308
| * | | | | | | | | | | | Introduce new hook data builders for Issue and MergeRequest34284-add-changes-to-issuable-webhook-dataRémy Coutable2017-10-0913-224/+423
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | Start adding Gitlab::HookData::IssuableBuilderRémy Coutable2017-10-0913-150/+369
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | Include the changes in issuable webhook payloadsRémy Coutable2017-10-0914-53/+157
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | Merge branch '38534-minigraph' into 'master'Phil Hughes2017-10-093-4/+14
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes mini graph in commit view Closes #38534 See merge request gitlab-org/gitlab-ce!14758
| * | | | | | | | | | | | Fixes mini graph in commit view38534-minigraphFilipa Lacerda2017-10-093-4/+14
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk-assignees-todos-fix' into 'master'Sean McGivern2017-10-093-5/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Backport of "Don't create todos for old issue assignees" See merge request gitlab-org/gitlab-ce!14765
| * | | | | | | | | | | | | Don't create todos for old issue assigneesJarka Kadlecova2017-10-093-5/+30
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '23888-fix-unsubscription-link-for-snippet-notification' into ↵Sean McGivern2017-10-094-234/+390
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Don't show an "Unsubscribe" link in snippet comment notifications Closes #23888 See merge request gitlab-org/gitlab-ce!14764
| * | | | | | | | | | | | | Don't show an "Unsubscribe" link in snippet comment notificationsRémy Coutable2017-10-094-234/+390
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | Merge branch 'rs-qa-sandbox-group' into 'master'Grzegorz Bizon2017-10-098-14/+138
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make use of a `gitlab-qa-sandbox` group if available See merge request gitlab-org/gitlab-ce!14682
| * | | | | | | | | | | | | Add QA::Scenario::Gitlab::Group::CreateRobert Speicher2017-10-097-59/+87
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add QA::Page::Group::New to fill in the "Create group" formrs-qa-sandbox-groupRobert Speicher2017-10-063-13/+28
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Clean up QA::Page::Dashboard::Groups a bitRobert Speicher2017-10-061-11/+16
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Use autoloading instead of an explicit requireRobert Speicher2017-10-062-1/+4
| | | | | | | | | | | | | |