delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove unneeded bundle refs.backport-mr-widget-ci-js	Bryce Johnson	2016-12-21	1	-2/+0
\|
*	Move javascript for widget check to ci_bundle.	Bryce Johnson	2016-12-21	2	-25/+40
\|
*	Backport moving MR widget CI JS out of script tag.	Bryce Johnson	2016-12-21	3	-18/+30
\|
*	Merge branch 'authentiq-id-oauth-support' into 'master'	Rémy Coutable	2016-12-21	10	-3/+91
\|\ \| \| \| \| \| \| \| \|	Added support for Authentiq OAuth provider See merge request !8038
\| *	Added support for Authentiq oauth provider	Alex	2016-12-21	10	-3/+91
\| \|
* \|	Merge branch '25895-fix-headers-in-ci-api-helpers' into 'master'	Kamil Trzciński	2016-12-21	3	-1/+10
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure nil User-Agent doesn't break the CI API Closes #25895 See merge request !8213
\| * \|	Ensure nil User-Agent doesn't break the CI API	Rémy Coutable	2016-12-21	3	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch 'badge-color-on-white-bg' into 'master'	Fatih Acet	2016-12-21	10	-22/+32
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	added lighter count badge background-color for on white backgrounds See merge request !7873
\| * \ \	Merge branch 'master' into 'badge-color-on-white-bg'	Dimitrie Hoekstra	2016-12-21	546	-4050/+15308
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \|	# Conflicts: # app/assets/stylesheets/pages/pipelines.scss
\| * \| \|	fixed variable, plus added light text color for light badgesbadge-color-on-white-bg	Dimitrie Hoekstra	2016-12-16	2	-1/+3
\| \| \| \|
\| * \| \|	Merge branch 'master' into 'badge-color-on-white-bg'	Dimitrie Hoekstra	2016-12-16	1056	-4251/+23898
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/assets/stylesheets/framework/nav.scss # app/assets/stylesheets/pages/environments.scss # app/views/layouts/nav/_group.html.haml # app/views/layouts/nav/_project.html.haml
\| * \ \ \	Merge branch 'master' into 'badge-color-on-white-bg'	Dimitrie Hoekstra	2016-12-04	306	-2915/+4767
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/assets/stylesheets/framework/nav.scss
\| * \| \| \| \|	created framework for badges, solving duplicate code	Dimitrie Hoekstra	2016-12-02	6	-21/+18
\| \| \| \| \| \|
\| * \| \| \| \|	Added lighter count badge background-color for on white backgrounds	Dimitrie Hoekstra	2016-12-01	7	-8/+16
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix/import-labels-error' into 'master'	Douwe Maan	2016-12-21	3	-5/+49
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Import/Export labels error Closes #24257 See merge request !8212
\| * \| \| \| \|	add changelogfix/import-labels-error	James Lopez	2016-12-21	1	-0/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Fix error importing label priorities and added relevant spec	James Lopez	2016-12-21	2	-5/+45
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '25225-fix-inconsistent-merge-button-styles' into 'master'	Alfredo Sumaran	2016-12-21	2	-44/+27
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Homogenize revert and cherry-pick button styles generated by commits_helper.rb Closes #25225 See merge request !8053
\| * \| \| \| \| \|	Set “Remove branch” button to default size	Alfredo Sumaran	2016-12-21	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	remove unused helper method	Mike Greiling	2016-12-21	1	-14/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	reduce common code even further to satisfy rake flay	Mike Greiling	2016-12-21	1	-23/+25
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	remove button class size alteration from revert and cherry pick links	Mike Greiling	2016-12-21	2	-4/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	factor out common code to satisfy rake flay	Mike Greiling	2016-12-21	1	-18/+16
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	homogenize revert and cherry-pick button styles generated by commits_helper	Mike Greiling	2016-12-21	1	-7/+4
\| \|/ / / / /
* \| \| \| \| \|	Merge branch '25681-network-graph-long-commit-msg' into 'master'	Alfredo Sumaran	2016-12-21	1	-6/+12
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Account for newlines in commit messages on network graph Closes #25681 and #21086 See merge request !8131
\| * \| \| \| \|	Respect newlines in commit messages on network graph25681-network-graph-long-commit-msg	Sam Rose	2016-12-16	1	-6/+12
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'remove-u2f-error-logging' into 'master'	Alfredo Sumaran	2016-12-21	6	-5/+10
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display error code for U2F errors See merge request !7305
\| * \| \| \| \| \|	Display error code for U2F errors (!7305)	winniehell	2016-11-07	6	-5/+10
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '25835-alert-wrapper-creates-extra-margin' into 'master'	Jacob Schatz	2016-12-21	1	-2/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \|	apply margin on alert banners only when there is one or more alerts	Mike Greiling	2016-12-20	1	-2/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix/25843' into 'master'	Sean McGivern	2016-12-20	13	-27/+24
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \|	Rename MattermostNotificationService back to MattermostServicefix/25843	Douglas Barbosa Alexandre	2016-12-20	7	-8/+8
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Rename SlackNotificationService back to SlackService	Douglas Barbosa Alexandre	2016-12-20	11	-19/+16
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '19703-direct-link-pipelines' into 'master'	Grzegorz Bizon	2016-12-20	30	-157/+684
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \|	Fix stage and pipeline specs and rubocop offenses19703-direct-link-pipelines	Grzegorz Bizon	2016-12-20	4	-21/+31
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add isolated view spec for pipeline stage partial	Grzegorz Bizon	2016-12-20	1	-0/+21
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Move test for HTML stage endpoint to controller specs	Grzegorz Bizon	2016-12-20	3	-33/+47
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix broken test	Filipa Lacerda	2016-12-20	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix broken test	Filipa Lacerda	2016-12-20	4	-16/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes after review
\| * \| \| \| \| \| \| \|	Adds tests for the mini pipeline graph	Filipa Lacerda	2016-12-20	3	-6/+50
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove console.log	Filipa Lacerda	2016-12-20	1	-2/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Adds tests for the MiniPipelineGraph class	Filipa Lacerda	2016-12-20	3	-2/+63
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Always show dropdown	Kamil Trzcinski	2016-12-20	1	-19/+12
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Improve specs	Kamil Trzcinski	2016-12-20	3	-9/+18
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add tests for stage API endpoint	Kamil Trzcinski	2016-12-20	6	-3/+70
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Pipeline graph node was one pixel off	Filipa Lacerda	2016-12-19	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Resolve conflict	Filipa Lacerda	2016-12-19	2	-77/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix tooltips in dropdown
\| * \| \| \| \| \| \| \|	Merge branch 'master' into 19703-direct-link-pipelines	Filipa Lacerda	2016-12-19	77	-568/+835
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (32 commits) Update CHANGELOG.md for 8.13.10 Update CHANGELOG.md for 8.14.5 Add Wiki import to BB importer Make CI badge hitboxes better match container Move admin broadcast messages spinach feature to rspec Move Admin Appearance spinach feature to rspec Fix MR issue to do with merge user Check if selected object is valid before passing to calback Fix for missing service when importing from EE to CE Fix tests because now we don't convert values Spaces for literal hash updated spec Keep the value type for YAML variables Test if expanded_environment_name could expand var Fix duplicated build token problem and added relevant spec Just implement it in the block Move admin labels spinach test to rspec Bring back "notification-dropdown" class for styling and use "js-notification-dropdown" for JavaScript Fix 500 error for invalid path when visiting blame page Add sentence casing, fix groups page buttons, fix dark gray variable ...
\| * \| \| \| \| \| \| \| \|	Adds loading to improve UX	Filipa Lacerda	2016-12-19	4	-21/+53
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Makes API call when stage is clicked	Filipa Lacerda	2016-12-19	6	-22/+95
\| \| \| \| \| \| \| \| \| \|