- 21 Dec, 2016 15 commits
-
-
Grzegorz Bizon authored
[ci skip]
-
Grzegorz Bizon authored
[ci skip]
-
Grzegorz Bizon authored
[ci skip]
-
Grzegorz Bizon authored
-
Grzegorz Bizon authored
* master: (367 commits) Set “Remove branch” button to default size remove unused helper method reduce common code even further to satisfy rake flay remove button class size alteration from revert and cherry pick links factor out common code to satisfy rake flay homogenize revert and cherry-pick button styles generated by commits_helper apply margin on alert banners only when there is one or more alerts Rename MattermostNotificationService back to MattermostService Rename SlackNotificationService back to SlackService Fix stage and pipeline specs and rubocop offenses Added QueryRecorder to test N+1 fix on Milestone#show Use gitlab-workhorse 1.2.1 Make 'unmarked as WIP' message more consistent Improve specs for Files API Allow unauthenticated access to Repositories Files API GET endpoints Add isolated view spec for pipeline stage partial Move test for HTML stage endpoint to controller specs Fix sizing of avatar circles; add border Fix broken test Fix broken test Changes after review ... Conflicts: app/assets/stylesheets/pages/pipelines.scss app/controllers/projects/pipelines_controller.rb app/views/projects/pipelines/index.html.haml spec/features/projects/pipelines/pipelines_spec.rb
-
Alfredo Sumaran authored
Homogenize revert and cherry-pick button styles generated by commits_helper.rb Closes #25225 See merge request !8053
-
Alfredo Sumaran authored
Account for newlines in commit messages on network graph Closes #25681 and #21086 See merge request !8131
-
Alfredo Sumaran authored
-
Mike Greiling authored
-
Mike Greiling authored
-
Mike Greiling authored
-
Mike Greiling authored
-
Mike Greiling authored
-
Alfredo Sumaran authored
Display error code for U2F errors See merge request !7305
-
Jacob Schatz authored
Apply margin on alert banners only when there is one or more alerts ## What does this MR do? Fixes extra margin added to all pages by !8151 ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![screenshot](https://gitlab.com/gitlab-org/gitlab-ce/uploads/f8804454e82a61246d10fa026605fbb3/Screen_Shot_2016-12-19_at_2.04.42_PM.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25835 See merge request !8209
-
- 20 Dec, 2016 25 commits
-
-
Mike Greiling authored
-
Sean McGivern authored
Rename SlackNotificationService back to SlackService ## What does this MR do? See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8191#note_20310845 ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25843 /cc @yorickpeterse @stanhu @smcgivern @felipe_artur @ayufan See merge request !8208
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Grzegorz Bizon authored
Resolve "Direct link from pipeline list to builds" ## What does this MR do? - Adds a dropdown with builds in the mini pipeline graph in the pipelines table - Unnest a lot of CSS related with pipelines in order to make it reusable ## Screenshots ![Screen_Shot_2016-12-15_at_14.45.41](/uploads/ca1c61842a422a34383e029d668034b7/Screen_Shot_2016-12-15_at_14.45.41.png) ![Screen_Shot_2016-12-15_at_14.45.49](/uploads/952e3277143639ce4ad111103034faeb/Screen_Shot_2016-12-15_at_14.45.49.png) ![Screen_Shot_2016-12-15_at_14.46.02](/uploads/f7369a124b1c3c0db4194de2cb637ef0/Screen_Shot_2016-12-15_at_14.46.02.png) ![graph_animation](/uploads/9bae036cb5acff499f992a4722943d72/graph_animation.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25071 Closes #19703 See merge request !8097
-
Sean McGivern authored
Fix N+1 queries on milestone show pages Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/25832 See merge request !8185
-
Grzegorz Bizon authored
-
Sean Packham authored
Rename "Online terminal" to "Web terminal" in the documentation ## What does this MR do? Renames online terminals to web terminals in some recently merged documentation ## Are there points in the code the reviewer needs to double check? I think I've caught all the links ## Why was this MR needed? We're calling it 'web terminal' in the release post, and consistency is
✨ https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/4007/diffs#note_20283597 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !8190 -
Fatih Acet authored
Fix sizing of avatar circles; add border * Adds border to group and project avatars * Fixes cut-off circles ![Screen_Shot_2016-12-20_at_8.25.12_AM](/uploads/24e0eedf001f230300a316c504af59d4/Screen_Shot_2016-12-20_at_8.25.12_AM.png) ![Screen_Shot_2016-12-20_at_8.24.59_AM](/uploads/23450bf1f99b8075a043dd5512185e91/Screen_Shot_2016-12-20_at_8.24.59_AM.png) Closes #25733 See merge request !8194
-
Sean McGivern authored
Allow unauthenticated access to Repositories Files API GET endpoints See merge request !8149
-
Rémy Coutable authored
Use gitlab-workhorse 1.2.1 More prometheus metrics, other small fixes. See merge request !8197
-
Fatih Acet authored
hides new issue btn for not loggedin user ## What does this MR do? This MR closes #25093 #25180 ## Are there points in the code the reviewer needs to double check? NR ## Why was this MR needed? Prevent issue creation for no logged in user and some confusion related to ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [ ] All builds are passing - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25093, #25180 See merge request !8175
-
James Edwards-Jones authored
-
Sean McGivern authored
Make 'unmarked as Work In Progress' system note more consistent See merge request !8193
-
Jacob Vosmaer authored
-
Sean McGivern authored
Memoize Milestoneish#issues_visible_to_user to reduce lookups https://gitlab.com/gitlab-org/gitlab-ce/issues/25748 See merge request !8146
-
jurre authored
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Grzegorz Bizon authored
-
Grzegorz Bizon authored
-
Sean McGivern authored
Allow Repositories API GET endpoints to be requested anonymously Closes #4269 See merge request !8148
-
Annabel Dunstone Gray authored
-
Filipa Lacerda authored
-
Filipa Lacerda authored
Changes after review
-