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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \|	Use a project factory with a repository where necessaryrs-empty_project-for-associations	Robert Speicher	2017-01-25	1	-4/+3
\| \|
* \|	Merge branch '26138-combine-webhooks-and-services-settings-pages' into 'master'	Rémy Coutable	2017-01-20	4	-9/+9
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Moved the webhooks and services gear options to a single one called integrations See merge request !8380
\| * \|	Fixed more tests	Jose Ivan Vargas	2017-01-18	1	-4/+4
\| \| \|
\| * \|	Fixed spinach feature tests for the services and hooks controllers	Jose Ivan Vargas	2017-01-18	3	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \|	Added a test for the integrations controller
* \| \|	Merge branch ↵	Fatih Acet	2017-01-19	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'24032-changed-visibility-level-to-public-but-project-is-not-public' into 'master' Update project visibility level ui to use dropdowns Closes #24296, #24123, and #24032 See merge request !7645
\| * \|	Fixed tests24032-changed-visibility-level-to-public-but-project-is-not-public	Luke "Jared" Bennett	2016-12-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grab permissions description from backend Review changes Added unit tests
* \| \|	Remove repository trait from factories that don't need it in featuresrs-repository-project-trait	Robert Speicher	2017-01-17	8	-13/+13
\| \| \|
* \| \|	Add the `:repository` trait to `:project` factories in Cucumber steps	Robert Speicher	2017-01-17	19	-33/+33
\| \| \|
* \| \|	Merge branch 'move-admin-groups-spinach-test-to-rspec' into 'master'	Rémy Coutable	2017-01-15	2	-147/+0
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \|	Move admin groups spinach tests to rspec See merge request !8313
\| * \|	Move admin groups spinach tests to rspec	Semyon Pupkov	2016-12-27	2	-147/+0
\| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \| \|	Merge branch 'move-dashboard-help-spinach-to-rspec' into 'master'	Rémy Coutable	2017-01-13	1	-21/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move dashboard help spinach test to rspec See merge request !8436
\| * \| \|	Move dashboard help spinach test to rspec	Semyon Pupkov	2017-01-04	1	-21/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \| \| \|	Merge branch 'move-dashboard-group-spinach-to-rspec' into 'master'	Rémy Coutable	2017-01-13	1	-25/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move dashboard group spinach test to rspec See merge request !8434
\| * \| \| \|	Move dashboard group spinach test to rspec	Semyon Pupkov	2017-01-04	1	-25/+0
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \| \| \|	Merge branch 'move-dashboard-archived-projects-spinach-to-rspec' into 'master'	Rémy Coutable	2017-01-13	1	-26/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move dashboard archived projects spinach tests to rspec See merge request !8431
\| * \| \| \|	Move dashboard archived projects spinach tests to rspec	Semyon Pupkov	2017-01-04	1	-26/+0
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \| \| \|	Merge branch 'move-dashboard-activetab-spinach-to-rspec' into 'master'	Rémy Coutable	2017-01-13	1	-5/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move dashboard active tab spinach test to rspec See merge request !8423
\| * \| \| \|	Move dashboard active tab spinach test to rspec	Semyon Pupkov	2017-01-03	1	-5/+0
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \| \| \|	Merge branch 'move-admin-users-spinach-tests-to-rspec' into 'master'	Rémy Coutable	2017-01-13	1	-167/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move admin users spinach tests to rspec See merge request !8395
\| * \| \| \|	Move admin users spinach tests to rspec	Semyon Pupkov	2017-01-02	1	-167/+0
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \| \| \|	Merge branch '25985-combine-members-and-groups-settings-pages' into 'master'	Alfredo Sumaran	2017-01-06	1	-2/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved the members and groups to single option called members Closes #25985 See merge request !8281
\| * \| \| \|	Fixed more rspec tests as well as spinach features	Jose Ivan Vargas	2017-01-03	1	-2/+4
\| \|/ / /
* \| \| \|	Move admin deploy keys spinach to rspec	Semyon Pupkov	2017-01-03	1	-59/+0
\|/ / /
* \| \|	Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master'	Douwe Maan	2016-12-27	1	-0/+59
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	12	-536/+9
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	5	-30/+13
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| * \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2016-12-06	11	-96/+24
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	show write access information when showing the key. TODO: It's ugly right now, need help!
* \| \| \| \|	Changes after review	Filipa Lacerda	2016-12-21	1	-9/+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	1	-104/+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	1	-104/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \| \| \| \|	Merge branch 'zj-kamil-slack-slash-commands' into 'master'	Grzegorz Bizon	2016-12-20	1	-4/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-3/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Improve after feedback	Kamil Trzcinski	2016-12-19	1	-4/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'move-admin-appearance-feature-to-rspec' into 'master'	Rémy Coutable	2016-12-19	2	-76/+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	2	-76/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Move admin broadcast messages spinach feature to rspec	jurre	2016-12-19	1	-66/+0
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'move-admin-label-spinach-test-to-rspec' into 'master'	Rémy Coutable	2016-12-19	1	-117/+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	1	-117/+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	2	-59/+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	2	-59/+0
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \| \| \| \|	Move admin deploy keys spinach test to rspec	Semyon Pupkov	2016-12-17	1	-46/+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	1	-41/+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	1	-41/+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	2	-66/+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	2	-66/+0
\| \|/ / /
* \| \| \|	fix failing tests	Mike Greiling	2016-12-10	1	-1/+1
\|/ / /