Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix broken testkt/bug/fix-revision-and-size-for-container-registry | Filipa Lacerda | 2017-10-17 | 1 | -2/+2 |
| | |||||
* | Fix failed test | Kamil Trzcinski | 2017-10-17 | 1 | -2/+2 |
| | |||||
* | Add short_revision and use total_size | Kamil Trzcinski | 2017-10-17 | 3 | -3/+8 |
| | |||||
* | Add explicit test to test resolved discussion toggle contentadd-resolve-discussion-test | Clement Ho | 2017-10-10 | 1 | -5/+15 |
| | |||||
* | Fix unable to expand text diff discussion comments | Clement Ho | 2017-10-10 | 1 | -6/+2 |
| | |||||
* | Stop using `branch_names.include?` and use `branch_exists?` | Andrew Newdigate | 2017-10-10 | 5 | -5/+5 |
| | |||||
* | Merge branch '38869-u2f' into 'master'38968-label-picker-should-be-cleared-upon-selecting-a-label | Phil Hughes | 2017-10-10 | 3 | -151/+131 |
|\ | | | | | | | | | Remove u2f from global namespace See merge request gitlab-org/gitlab-ce!14776 | ||||
| * | Remove u2f from globalnamespace38869-u2f | Filipa Lacerda | 2017-10-09 | 3 | -151/+131 |
| | | |||||
* | | Merge branch 'flash-es6-module' into 'master' | Filipa Lacerda | 2017-10-10 | 3 | -6/+275 |
|\ \ | | | | | | | | | | | | | Flash is now a ES6 module See merge request gitlab-org/gitlab-ce!14626 | ||||
| * | | fixed notes specs | Phil Hughes | 2017-10-10 | 1 | -1/+23 |
| | | | | | | | | | | | | | | | changed how the container class is added onto the text element more specs | ||||
| * | | karma spec fixes | Phil Hughes | 2017-10-10 | 2 | -5/+5 |
| | | | |||||
| * | | fixed eslint | Phil Hughes | 2017-10-10 | 1 | -3/+2 |
| | | | |||||
| * | | flash tests | Phil Hughes | 2017-10-10 | 1 | -0/+248 |
| | | | | | | | | | | | | added back in documentation comment to flash file | ||||
| * | | spec fixes | Phil Hughes | 2017-10-10 | 1 | -1/+1 |
| | | | |||||
* | | | Fix a liniting error introduced by !14652 | Ahmad Sherif | 2017-10-10 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch '38245-private-avatars-are-not-cdn-compatible' into 'master' | Douwe Maan | 2017-10-10 | 3 | -6/+49 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Private Avatars are not CDN compatible" Closes #38245 and gitlab-com/support-forum#2476 See merge request gitlab-org/gitlab-ce!14443 | ||||
| * | | | Fix for Lint Error + Upload Test | Tim Zallmann | 2017-10-09 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixed Tests | Tim Zallmann | 2017-10-04 | 2 | -3/+3 |
| | | | | |||||
| * | | | Fixed Test | Tim Zallmann | 2017-10-04 | 1 | -2/+1 |
| | | | | |||||
| * | | | Fixed Linting errors + tests | Tim Zallmann | 2017-10-04 | 2 | -9/+10 |
| | | | | |||||
| * | | | Created group_icon and group_icon_url | Tim Zallmann | 2017-10-04 | 1 | -2/+45 |
| | | | | | | | | | | | | | | | | Tests for these new helper methods | ||||
* | | | | Merge branch '38941-lock-note-fix' into 'master' | Sean McGivern | 2017-10-10 | 2 | -2/+40 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 note | Jarka Kadlecova | 2017-10-10 | 2 | -2/+40 |
| | | | | | |||||
* | | | | | Merge branch 'fix-timestampz-cop' into 'master' | Grzegorz Bizon | 2017-10-10 | 1 | -0/+26 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Also warn on timestamp in datetime migration cop See merge request gitlab-org/gitlab-ce!14784 | ||||
| * | | | | | Also warn on timestamp in datetime migration copfix-timestampz-cop | Sean McGivern | 2017-10-10 | 1 | -0/+26 |
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | | | Remove Build code from global namespace | Filipa Lacerda | 2017-10-10 | 2 | -24/+23 |
| | | | | | |||||
* | | | | | Merge branch 'feature/migrate-workhorse-send-git-diff-patch-to-gitaly' into ↵ | Robert Speicher | 2017-10-10 | 1 | -11/+55 |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | '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-gitaly | Ahmad Sherif | 2017-10-09 | 1 | -11/+55 |
| | | | | | |||||
* | | | | | Backports EE 38771 changes to CE. | Tiago Botelho | 2017-10-10 | 2 | -0/+39 |
| |/ / / |/| | | | |||||
* | | | | Fix bad type checking to prevent 0 count badge to be shown | Filipa Lacerda | 2017-10-10 | 2 | -44/+39 |
| |_|/ |/| | | |||||
* | | | Merge branch '34284-add-changes-to-issuable-webhook-data' into 'master' | Douwe Maan | 2017-10-09 | 10 | -69/+344 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 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-data | Rémy Coutable | 2017-10-09 | 7 | -113/+230 |
| | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | Start adding Gitlab::HookData::IssuableBuilder | Rémy Coutable | 2017-10-09 | 6 | -90/+201 |
| | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | Include the changes in issuable webhook payloads | Rémy Coutable | 2017-10-09 | 5 | -31/+78 |
| | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | Merge branch 'jk-assignees-todos-fix' into 'master' | Sean McGivern | 2017-10-09 | 1 | -0/+24 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | 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 assignees | Jarka Kadlecova | 2017-10-09 | 1 | -0/+24 |
| |/ / / | |||||
* | | | | Merge branch '23888-fix-unsubscription-link-for-snippet-notification' into ↵ | Sean McGivern | 2017-10-09 | 2 | -233/+380 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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 notifications | Rémy Coutable | 2017-10-09 | 2 | -233/+380 |
| |/ / / | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | Merge branch 'master' into 'group-sort-dropdown-blank' | Robert Speicher | 2017-10-09 | 364 | -900/+8538 |
|\ \ \ \ | |/ / / | | | | | | | | | # Conflicts: # spec/features/dashboard/group_spec.rb | ||||
| * | | | Merge branch 'bvl-fork-network-migrations' into 'master' | Yorick Peterse | 2017-10-09 | 1 | -0/+8 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create fork networks for root projects that are deleted Closes #38905 See merge request gitlab-org/gitlab-ce!14752 | ||||
| | * | | | Don't create fork networks for root projects that are deletedbvl-fork-network-migrations | Bob Van Landuyt | 2017-10-09 | 1 | -0/+8 |
| | | | | | |||||
| * | | | | Merge branch '37552-replace-js-true-with-js' into 'master' | Rémy Coutable | 2017-10-09 | 179 | -328/+381 |
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | Replaces `tag: true` into `:tag` in the specs Closes #37552 See merge request gitlab-org/gitlab-ce!14653 | ||||
| | * | | | Replaces `tag: true` into `:tag` in the specs | Jacopo | 2017-10-07 | 179 | -328/+381 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces all the explicit include metadata syntax in the specs (tag: true) into the implicit one (:tag). Added a cop to prevent future errors and handle autocorrection. | ||||
| * | | | | Removes CommitsList from global namespace | Filipa Lacerda | 2017-10-09 | 1 | -56/+52 |
| | | | | | |||||
| * | | | | Merge branch 'abuse-reports-module' into 'master' | Filipa Lacerda | 2017-10-09 | 1 | -41/+39 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Convert AbuseReports class to a module See merge request gitlab-org/gitlab-ce!14709 | ||||
| | * | | | | Convert AbuseReports class to a moduleabuse-reports-module | Phil Hughes | 2017-10-06 | 1 | -41/+39 |
| | | | | | | |||||
| * | | | | | Remove AjaxLoadingSpinner and CreateLabelDropdown from global namespace | Filipa Lacerda | 2017-10-09 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Merge branch 'sh-show-all-slack-names' into 'master' | Robert Speicher | 2017-10-09 | 5 | -36/+37 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include GitLab full name with username in Slack messages Closes #38865 See merge request gitlab-org/gitlab-ce!14740 | ||||
| | * | | | | | Include GitLab full name with username in Slack messagessh-show-all-slack-names | Stan Hu | 2017-10-06 | 5 | -36/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to include the first and last name of the user, but !6624 modified this to include only the username. Let's compromise and add both in the form of `First Last (username)`. Closes #38865 | ||||
| * | | | | | | Move cycle analytics banner into a vue file | Filipa Lacerda | 2017-10-09 | 1 | -0/+41 |
| | |_|_|/ / | |/| | | | |