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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master'	Douwe Maan	2016-12-27	2	-0/+82
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Allow to add deploy keys with write-access Closes #1376 See merge request !7383
\| *	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2016-12-20	20	-786/+13
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/1376-allow-write-access-deploy-keys * upstream/master: (538 commits) Reject blank environment vcariables in Gitlab::Git::RevList Add online terminal documentation Add changelog entry Add terminal UI and controller actions Fix specs Even out padding on plus button in breadcrumb menu Update font size of detail page header to 14px Update CHANGELOG.md for 8.13.10 Update CHANGELOG.md for 8.14.5 Fix Route#rename_children behavior Remove inline-block styling from status Add terminals to the Kubernetes deployment service Add a ReactiveCaching concern for use in the KubernetesService Add xterm.js 2.1.0 and a wrapper class to the asset pipeline Remove unnecessary hidden svg elements for icons. Fix consistent typo in environment.js Use a block to insert extra check for authenticate_build! Align milestone column header with count number Add Wiki import to BB importer Make CI badge hitboxes better match container ...
\| * \	Merge CSS	Filipa Lacerda	2016-12-12	7	-47/+13
\| \|\ \
\| * \ \	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2016-12-06	16	-135/+33
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/1376-allow-write-access-deploy-keys * upstream/master: (488 commits) Merge branch 'issue_25064' into 'security' It's secret variables, not secure Fix dead links, add example of debug trace output, simplify titles Authorize users into imported GitLab project Document button secondary states. Update icons and color section Remove unused votes.scss Remove unused errors css Fixed MR widget content wrapping for XS viewports NIGNX -> Nginx Use pry-byebug instead byebug Fixed influence from other specs. Accept `issue new` as command to create an issue Update paranoia from 2.1.4 to 2.2.0. Use the pagination helper in the API Added changelog for #25221 Fixed top margin for Builds page status header information Satisfied eslint Fix compatibility with Internet Explorer 11 for merge requests change the date label to match the date used fix gfm doc typo about two spaces for next line transfer ...
\| * \| \| \|	Allow admin to set keys with write access, and	Lin Jen-Shin	2016-11-22	2	-2/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	show write access information when showing the key. TODO: It's ugly right now, need help!
* \| \| \| \|	Changes after review	Filipa Lacerda	2016-12-21	2	-11/+0
\| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken test Remove spinach tests for the builds tab
* \| \| \|	Merge branch 'move-admin-projects-spinach-tests-to-rspec' into 'master'	Rémy Coutable	2016-12-20	2	-151/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move admin projects spinach tests to RSpec Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/23036 See merge request !8174
\| * \| \| \|	Move admin projects spinach tests to rspec	Semyon Pupkov	2016-12-19	2	-151/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \| \| \| \|	Merge branch 'zj-kamil-slack-slash-commands' into 'master'	Grzegorz Bizon	2016-12-20	2	-8/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Slack slash commands ## What does this MR do? Implement Slack Slash Commands by utilizing generalized Mattermost presenter to fulfill Slack requirements. ## Why was this MR needed? We want to expose Slack Slash Commands as a first-class service. ## What are the relevant issue numbers? Supersedes !8007 Closes #22182 See merge request !8126
\| * \| \| \| \|	Fix specszj-kamil-slack-slash-commands	Kamil Trzcinski	2016-12-19	2	-6/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Improve after feedback	Kamil Trzcinski	2016-12-19	2	-7/+7
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'move-admin-appearance-feature-to-rspec' into 'master'	Rémy Coutable	2016-12-19	3	-113/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move Admin Appearance spinach feature to RSpec Part of #23036 See merge request !8063
\| * \| \| \| \| \|	Move Admin Appearance spinach feature to rspec	jurre	2016-12-19	3	-113/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Move admin broadcast messages spinach feature to rspec	jurre	2016-12-19	2	-99/+0
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'move-admin-label-spinach-test-to-rspec' into 'master'	Rémy Coutable	2016-12-19	2	-155/+0
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move admin labels spinach test to RSpec Part of #23036 See merge request !8166
\| * \| \| \| \|	Move admin labels spinach test to rspec	Semyon Pupkov	2016-12-19	2	-155/+0
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \| \| \| \|	Merge branch 'move-admin-application-spinach-test-to-rspec' into 'master'	Rémy Coutable	2016-12-19	3	-77/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move admin application spinach test to RSpec Part of #23036 See merge request !8140
\| * \| \| \| \|	Move admin application spinach test to rspec	Semyon Pupkov	2016-12-17	3	-77/+0
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \| \| \| \|	Move admin deploy keys spinach test to rspec	Semyon Pupkov	2016-12-17	2	-62/+0
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \| \| \|	Merge branch 'move-admin-active-tab-spinach-tests-to-rspec' into 'master'	Rémy Coutable	2016-12-15	2	-95/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move admin active tab spinach tests to RSpec See merge request !8037
\| * \| \| \|	Move admin active tab spinach tests to rspec	Semyon Pupkov	2016-12-12	2	-95/+0
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \| \| \|	Merge branch 'jej-24637-move-issue-visible_to_user-to-finder' into 'security'	Sean McGivern	2016-12-15	2	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue#visible_to_user moved to IssuesFinder Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24637. See merge request !2039
* \| \| \|	Merge branch 'dz-fix-admin-routes' into 'master'	Sean McGivern	2016-12-14	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for nested groups to admin routing See merge request !8008
\| * \| \| \|	Add support for nested groups to admin routingdz-fix-admin-routes	Dmitriy Zaporozhets	2016-12-11	1	-1/+1
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'move-admin-settings-feature-to-rspec' into 'master'	Rémy Coutable	2016-12-13	3	-85/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace the Spinach specs for admin settings with RSpec feature specs as per #23036 Part of #23036 See merge request !8058
\| * \| \| \|	Move admin settings spinach feature to rspec	jurre	2016-12-13	3	-85/+0
\| \|/ / /
* \| \| \|	fix failing tests	Mike Greiling	2016-12-10	1	-1/+1
\|/ / /
* \| \|	Group links spec update	Phil Hughes	2016-12-09	1	-1/+1
\| \| \|
* \| \|	Updated members dropdowns	Phil Hughes	2016-12-07	2	-2/+11
\| \| \| \| \| \| \| \| \| \| \| \|	This ports some code over from EE to reduce conflicts
* \| \|	Merge branch 'move-admin-hooks-spinach-test-to-rspec' into 'master'	Rémy Coutable	2016-12-07	2	-24/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move admin hooks spinach to RSpec https://gitlab.com/gitlab-org/gitlab-ce/issues/23036 See merge request !7942
\| * \| \|	Move admin hooks spinach to rspec	Semyon Pupkov	2016-12-06	2	-24/+0
\| \| \|/ \| \|/\| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \| \|	Merge branch 'move-admin-logs-spinach-test-to-rspec' into 'master'	Rémy Coutable	2016-12-07	2	-19/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move admin logs spinach test to RSpec https://gitlab.com/gitlab-org/gitlab-ce/issues/23036 See merge request !7945
\| * \| \|	Move admin logs spinach test to rspec	Semyon Pupkov	2016-12-06	2	-19/+0
\| \|/ / \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \| \|	Update effected testszj-guest-reads-public-builds	Z.J. van de Weg	2016-12-04	1	-1/+1
\|/ /
* \|	Merge branch '22781-user-generated-permalinks' into 'master'	Fatih Acet	2016-12-01	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "User-generated permalink IDs collide with GitLab interface" ## What does this MR do? Prevents ID values automatically generated by headers in [GitLab Flavored Markdown](https://github.com/gitlabhq/gitlabhq/blob/master/doc/user/markdown.md#header-ids-and-links) from colliding with IDs used elsewhere in the GitLab interface. This can cause confusion when, for instance, a selector looks for a merge request tab with `id="pipelines"` and there is a header with the same ID earlier in the DOM. How this works: * All header IDs generated with GitLab Flavored Markdown are namespaced with `id="user-content_foo"` * All anchor links which point to these IDs continue to use the non-namespaced hash `<a href="#foo">...</a>` * When a page is loaded or when the `hashchange` event is triggered, javascript will automatically search for `#user-content_foo` if `#foo` cannot be found, and scroll to that position instead. ## Before ![2016-11-21-13.00.28](/uploads/e3be2cd6a9142dfd6e64db5462a6aa76/2016-11-21-13.00.28.gif) ## After: ![2016-11-21-13.12.45](/uploads/f7ae3f3a30c91325eaa3665591b6a850/2016-11-21-13.12.45.gif) ![2016-11-21-13.03.00](/uploads/3a6a782c081ecaa05b8781548d794909/2016-11-21-13.03.00.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22781 See also prior attempts to address this issue: #3908, !2023, !2024 See merge request !7631
\| * \|	remove underscore from user-content id namespace22781-user-generated-permalinks	Mike Greiling	2016-11-30	1	-1/+1
\| \| \|
\| * \|	update gitlab flavored markdown tests to reflect namespaced ids	Mike Greiling	2016-11-30	1	-1/+1
\| \| \|
* \| \|	fix tests broken by new wiki page design	Mike Greiling	2016-11-30	3	-18/+9
\|/ /
* \|	Homogenize dropdowns on Issue page	David Wagner	2016-11-28	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sort and filter dropdowns look the same and tweak their icon and colors according to #24150. Signed-off-by: David Wagner <david@marvid.fr>
* \|	Pass `--load-images=no` to PhantomJS via Capybara/Poltergeistrs-phantomjs-disable-images	Robert Speicher	2016-11-28	1	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \|	We were unintentionally hitting `gravatar.com` whenever a test that used Poltergeist was run. This was certainly wasting their resources and slowing down our tests even further, for no reason.
* \|	Merge branch 'rephrase-system-notes' into 'master'	Robert Speicher	2016-11-25	2	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Rephrase some system notes to be compatible with new system note style See merge request !7692
\| * \|	Rephrase some system notes to be compatible with new system note stylerephrase-system-notes	Douwe Maan	2016-11-24	2	-2/+2
\| \|/
* \|	Merge branch 'move-admin-spam-spinach-test-to-rspec' into 'master'	Rémy Coutable	2016-11-24	2	-36/+0
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Move admin spam spinach test to RSpec See merge request !7708
\| * \|	Move admin spam spinach test to Rspec	Semyon Pupkov	2016-11-23	2	-36/+0
\| \|/ \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \|	Merge branch 'dz-allow-nested-group-routing' into 'master'	Douwe Maan	2016-11-24	3	-2/+9
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add nested groups support to the routing ## What does this MR do? It allows routing with `/` in namespace name ## Why was this MR needed? For nested groups feature(https://gitlab.com/gitlab-org/gitlab-ce/issues/2772). We need URI like `/group/subgroup/project` be routed correctly ## 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 - [x] 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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/2772 See merge request !7459
\| * \|	Add nested groups support to the routingdz-allow-nested-group-routing	Dmitriy Zaporozhets	2016-11-23	3	-2/+9
\| \|/ \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'move-admin-abuse-report-spinach-test-to-rspec' into 'master'	Rémy Coutable	2016-11-24	2	-23/+0
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move admin abuse report spinach test to RSpec https://gitlab.com/gitlab-org/gitlab-ce/issues/23036 See merge request !7691
\| * \|	Move admin abuse report spinach test to rspec	Semyon Pupkov	2016-11-23	2	-23/+0
\| \|/ \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \|	Move abuse report spinach test to rspec	Semyon Pupkov	2016-11-23	2	-49/+0
\|/ \| \| \|	part of https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
*	Merge branch '20840-getting-started-better-empty-state-for-issues-view' into ↵	Jacob Schatz	2016-11-22	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Issues empty state ## What does this MR do? Adds the empty state for the project, dashboard and group issues. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ### Filtered to show no issues (on group issues page in this case but also dashboard and projects) ![Screen_Shot_2016-11-08_at_20.55.56](/uploads/b598af4a8a5e2c9fbb859abf36e70e4b/Screen_Shot_2016-11-08_at_20.55.56.png) ### Project with no issues ![Screen_Shot_2016-11-08_at_20.57.08](/uploads/8f54fdf1b3101c46299249fa2944207d/Screen_Shot_2016-11-08_at_20.57.08.png) ![Screen_Shot_2016-11-08_at_20.57.17](/uploads/1d2d162e1d845dd05e945d8ebb1d2101/Screen_Shot_2016-11-08_at_20.57.17.png) ### Group with no projects with any issues ![Screen_Shot_2016-11-08_at_20.54.55](/uploads/f28dc2038839d5bda0eb37f37927d5db/Screen_Shot_2016-11-08_at_20.54.55.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 #20840 Closes #20850 See merge request !7309