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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Removed jQuery UI highlight & autocompleteremove-jquery-ui-plugins	Phil Hughes	2017-02-09	1	-16/+17
\| \| \| \|	In an effort to tackle #18437 this removes 2 of the jQuery UI plugins. Highlight & autocomplete, both used once in our code. Highlight was just removed easily, autocomplete was replaced with GL dropdown
*	Merge branch 'dz-create-nested-groups-via-ui' into 'master'	Dmitriy Zaporozhets	2017-02-09	1	-1/+18
\|\ \| \| \| \| \| \| \| \|	Allow creating nested group via UI See merge request !8786
\| *	Allow creating nested group via UIdz-create-nested-groups-via-ui	Dmitriy Zaporozhets	2017-02-07	1	-1/+18
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'remove-jquery-ui-datepicker' into 'master'	Jacob Schatz	2017-02-08	4	-17/+21
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Removed jQuery UI datepicker See merge request !8421
\| * \|	Changed date check testremove-jquery-ui-datepicker	Phil Hughes	2017-02-06	1	-19/+23
\| \| \|
\| * \|	Fixed missing edit link click	Phil Hughes	2017-02-06	1	-1/+3
\| \| \|
\| * \|	Fixed some specs	Phil Hughes	2017-02-06	4	-31/+29
\| \|/ \| \| \| \| \| \|	CHANGELOG item
* \|	Merge branch 'remove-jquery-ui-sortable' into 'master'	Jacob Schatz	2017-02-08	3	-17/+19
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Removed jQuery UI sortable See merge request !8478
\| * \|	Removed jQuery UI sortableremove-jquery-ui-sortable	Phil Hughes	2017-02-06	3	-17/+19
\| \|/
* \|	Merge branch '27756-fix-json-404-response' into 'master'	Clement Ho	2017-02-08	1	-0/+22
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes ajax requests when current URL has a trailing slash Closes #27756 See merge request !9010
\| * \|	Remove sleep from tests	Clement Ho	2017-02-08	1	-2/+0
\| \| \|
\| * \|	Add tests27756-fix-json-404-response	Alfredo Sumaran	2017-02-07	1	-0/+24
\| \| \|
* \| \|	Merge branch '27880-pipelines-table-not-showing-commit-branch' into 'master'	Clement Ho	2017-02-08	1	-0/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Looks for correct key to pass to commit prop. Adds rspec test. Closes #27880 See merge request !9070
\| * \| \|	Looks for correct key to pass to commit prop. Adds rspec test.	Filipa Lacerda	2017-02-08	1	-0/+4
\| \| \| \|
* \| \| \|	Fixed random merge request widget failure	Phil Hughes	2017-02-08	1	-2/+0
\|/ / /
* \| \|	Merge branch '26705-filter-todos-by-manual-add' into 'master'	Sean McGivern	2017-02-08	1	-7/+50
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Filter todos by manual add Closes #26705 See merge request !8861
\| * \|	Filter todos by manual add	Jacopo	2017-01-28	1	-7/+50
\| \| \| \| \| \| \| \| \| \| \| \|	Added the option to filter todo by Added and Pipelines
* \| \|	Merge branch 'fix/gb/invalid-new-merge-request-api' into 'master'	Fatih Acet	2017-02-07	1	-0/+20
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix rendering pipelines for a new merge request See merge request !9032
\| * \| \|	Add feature spec for a new merge request with pipeline	Grzegorz Bizon	2017-02-07	1	-0/+20
\| \| \| \|
* \| \| \|	Merge branch ↵	Alfredo Sumaran	2017-02-07	1	-0/+100
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'23785-with-builds-tab-gone-give-additional-context-in-system-information-element-in-mr-commit-views-by-adding-mini-pipeline-graph' into 'master' added inline pipeline graph Closes #23785 See merge request !8576
\| * \| \| \|	added inline pipeline graph23785-with-builds-tab-gone-give-additional-context-in-system-information-element-in-mr-commit-views-by-adding-mini-pipeline-graph	Luke "Jared" Bennett	2017-02-07	1	-0/+100
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added tests review changes
* \| \| \|	Merge branch 'route-map' into 'master'	Robert Speicher	2017-02-07	3	-0/+140
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add 'View on [env]' link to blobs and individual files in diffs See merge request !8867
\| * \| \| \|	Address feedback	Douwe Maan	2017-02-06	1	-4/+4
\| \| \| \| \|
\| * \| \| \|	Add feature specs	Douwe Maan	2017-02-06	5	-34/+140
\| \| \| \| \|
\| * \| \| \|	Add tests	Douwe Maan	2017-02-06	6	-0/+34
\| \| \| \| \|
* \| \| \| \|	Merge branch ↵	Clement Ho	2017-02-07	2	-19/+24
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'25487-small-improvements-to-the-ui-of-mattermost-and-slack-command-services' into 'master' Resolve "Small improvements to the UI of Mattermost and Slack Command services" Closes #25487 See merge request !8491
\| * \| \| \| \|	Added small improvments to the chat slash command services	Luke "Jared" Bennett	2017-02-07	2	-19/+24
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Updated specs
* \| \| \| \|	Merge branch '24147-delete-env-button' into 'master'	Rémy Coutable	2017-02-07	2	-18/+46
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Makes stop button visible in environment page Closes #24147 See merge request !7379
\| * \| \| \| \|	Fix stop action24147-delete-env-button	Kamil Trzcinski	2017-02-07	1	-13/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Update changes	Kamil Trzcinski	2017-02-06	1	-18/+30
\| \| \| \| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'origin/master' into 24147-delete-env-button	Kamil Trzcinski	2017-02-06	47	-311/+1517
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'origin/master' into 24147-delete-env-button	Kamil Trzcinski	2017-01-24	151	-2428/+8431
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Fix rubocop error	Filipa Lacerda	2016-11-11	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Adds tests	Filipa Lacerda	2016-11-10	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds changelog entry in the correct place
\| * \| \| \| \| \|	Allow to stop any environment	Kamil Trzcinski	2016-11-10	1	-4/+18
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '27564-shave-dropdown-label-search-spec-duration' into 'master'	Robert Speicher	2017-02-07	1	-100/+118
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "spec/features/issues/filtered_search/dropdown_label_spec.rb takes 10 minutes to run" Closes #27564 See merge request !8929
\| * \| \| \| \| \| \|	Shave spec/features/issues/filtered_search/dropdown_label_spec.rb from 10 ↵27564-shave-dropdown-label-search-spec-duration	Rémy Coutable	2017-02-03	1	-100/+118
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	minutes to 1.5 minutes - Don't use `sleep` (most of the time was wasted by that) - Expect some elements to be visible instead: capybara is smart enough to retry a few times if it cannot find an element - See https://github.com/teamcapybara/capybara#asynchronous-javascript-ajax-and-friends - Don't create unneccessary DB records - Group some examples together to shave some setup time (where it makes sense) Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch '8082-permalink-to-file' into 'master'	Alfredo Sumaran	2017-02-07	1	-0/+37
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add keyboard shortcut to move to file permalink `y` Closes #8082 See merge request !8799
\| * \| \| \| \| \| \| \|	Add keyboard shortcut to move to file permalink8082-permalink-to-file	Eric Eastwood	2017-02-06	1	-0/+37
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/8082
* \| \| \| \| \| \| \|	Merge branch '21518_recaptcha_spam_issues' into 'master'	Sean McGivern	2017-02-07	1	-0/+66
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use reCaptcha when an issue identified as spam Closes #21518 See merge request !8846
\| * \| \| \| \| \| \|	Use reCaptcha when an issue identified as spam	Jarka Kadlecova	2017-02-07	1	-0/+66
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch ↵	Kamil Trzciński	2017-02-07	5	-2/+44
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'26165-combine-runners-and-variables-and-triggers-and-ci-cd-pipelines-settings-pages' into 'master' Merge Triggers, Runners, Variables and Pipelines to a single option called "CI/CD Pipelines" Closes #26165 See merge request !8430
\| * \| \| \| \| \| \|	Fixed tests, renamed files and methods	Jose Ivan Vargas	2017-02-06	3	-2/+16
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Changed the controller/route name to 'ci/cd' and renamed the corresponding files	Jose Ivan Vargas	2017-02-06	4	-7/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added tests to verify the access policy to the new controller
\| * \| \| \| \| \| \|	Added private methods to initialize variables in the ci_cd_pipelines_controller	Jose Ivan Vargas	2017-02-06	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Corrected tests and changed trigger controller redirects to the ↵	Jose Ivan Vargas	2017-02-06	1	-1/+0
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ci_cd_pipelines_settings controller
* \| \| \| \| \| \|	Merge branch 'ee-1439-read-only-user' into 'master'	Douwe Maan	2017-02-07	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport changes from gitlab-org/gitlab-ee!998 See merge request !8984
\| * \| \| \| \| \| \|	Backport of the frontend view, including tests	Jose Ivan Vargas	2017-02-06	1	-1/+1
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fe-commit-mr-pipelines' into 'master'	Fatih Acet	2017-02-06	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use vue.js Pipelines table in commit and merge request view Closes #27141 See merge request !8844
\| * \| \| \| \| \|	Merge branch 'master' into fe-commit-mr-pipelines	Filipa Lacerda	2017-02-04	2	-1/+3
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (76 commits) fix failing test fix Vue warnings for missing element [ci skip] UX Guide: Button placement in groups Change window size before visiting page, to get correct scroll position Fix slash commands spec error Move project services to new location under Integrations Move webhooks to new a location under Integrations Fixed redirection from http://someproject.git to http://someproject consistently use single quotes allow application.js to require other scripts which start with application* DRY with Gitlab.config.webpack.dev_server references disable webpack proxy in rspec environment due to conflicts with webmock gem remove changes to Procfile configure webpack dev server port via environment variable add rack middleware to proxy webpack dev server remove dev-server config from development environment Document that the retro and kickoff notes are public add CHAGELOG.md entry for webpack branch fix failing rspec build fix test failure for merge request widget ...