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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\|
*	Add a `:repository` trait to the `:empty_project` factory	Robert Speicher	2017-01-17	1	-0/+4
\| \| \| \| \| \| \|	Right now this is a no-op. We're going to add it as a trait argument to all existing usages of the `:project` factory, so that later we can flip `:empty_project` to just be `:project`, forcing developers to opt-in to the slower option when their tests truly require it.
*	Merge branch 'mr-tabs-alignment-sidebar-open' into 'master'	Annabel Dunstone Gray	2017-01-17	2	-1/+9
\|\ \| \| \| \| \| \| \| \|	Correctly keeps merge request tabs in place when editting value in See merge request !8595
\| *	Correctly keeps merge request tabs in place when editting value inmr-tabs-alignment-sidebar-open	Phil Hughes	2017-01-16	2	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	collapsed sidebar Previously the CSS would presume the sidebar is open, which it is but as an overlay so the CSS was pushing the tabs when it shouldnt of been
* \|	Merge branch 'rubocop-todo' into 'master'	Grzegorz Bizon	2017-01-17	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Disable all cops in .rubocop_todo.yml See merge request !8610
\| * \|	Disable all cops in .rubocop_todo.ymlrubocop-todo	Sean McGivern	2017-01-17	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cops with a max level are auto-generated with that set to the current maximum, even when they're supposed to be ignored. For now, the best option is to manually disable them.
* \| \|	Merge branch '24915_merge_slash_command' into 'master'	Sean McGivern	2017-01-17	22	-8/+540
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support `/merge` slash command for MRs Closes #24915 See merge request !7746
\| * \| \|	Address MR comments	Jarka Kadlecova	2017-01-13	11	-26/+60
\| \| \| \|
\| * \| \|	refresh merge widget after using /merge command	Jarka Kadlecova	2017-01-11	5	-0/+77
\| \| \| \|
\| * \| \|	support `/merge` slash comand for MRs	Jarka Kadlecova	2017-01-11	15	-8/+429
\| \| \| \|
* \| \| \|	Merge branch 'reduce-queries-milestone-index' into 'master'	Sean McGivern	2017-01-17	3	-3/+10
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use cached values to compute total issues count in milestone index pages See merge request !8518
\| * \| \| \|	Use cached values to compute total issues count in milestone index pagesreduce-queries-milestone-index	Adam Niedzielski	2017-01-10	3	-3/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Milestoneish#issues_visible_to_user caches only the ActiveRecord relation, not the actual result. Introduce Milestoneish#total_issues_count that relies on the cached method Milestoneish#count_issues_by_state to reduce the number of queries.
* \| \| \| \|	Merge branch 'fix/keep-artifacts-button-visibility' into 'master'	Sean McGivern	2017-01-17	5	-9/+49
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not show artifacts keep button if not allowed Closes #26357 See merge request !8501
\| * \ \ \ \	Merge branch 'master' into fix/keep-artifacts-button-visibilityfix/keep-artifacts-button-visibility	Grzegorz Bizon	2017-01-16	343	-3496/+11342
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (579 commits) Conflicts: spec/models/build_spec.rb
\| * \| \| \| \| \|	Add method that checks for expiring build artifacts	Grzegorz Bizon	2017-01-09	4	-17/+40
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add changelog for artifacts button visibility fix	Grzegorz Bizon	2017-01-09	1	-0/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Do not show artifacts keep button if not allowed	Grzegorz Bizon	2017-01-09	2	-8/+22
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'issue_25017' into 'master'	Sean McGivern	2017-01-17	7	-21/+63
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show 'too many changes' message for merge request Closes #25017 See merge request !8444
\| * \| \| \| \| \| \|	Show 'too many changes' message for merge requestissue_25017	Felipe Artur	2017-01-12	8	-22/+64
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'pmq20/gitlab-ce-psvr/persisted' into 'master'	Robert Speicher	2017-01-17	2	-1/+9
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mark Commits as persisted See merge request !8604
\| * \| \| \| \| \| \|	Mark Commit persistedpmq20/gitlab-ce-psvr/persisted	P.S.V.R	2017-01-16	2	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'switch-to-sassc' into 'master'	Robert Speicher	2017-01-17	3	-8/+17
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Switch to sassc-rails Closes #18432 See merge request !8556
\| * \| \| \| \| \| \|	Switch to sassc-rails	Richard Macklin	2017-01-16	3	-8/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #18432 This uses sassc to compile the application's SASS so it compiles faster. Without attempting to be very scientific here are some numbers I got: Using sassc-rails: ``` [1] pry(main)> Benchmark.bm { \|bm\| bm.report { Rails.application.assets["application.css"] } } user system total real 1.430000 0.380000 1.810000 ( 1.830753) ``` Using sass-rails: ``` [1] pry(main)> Benchmark.bm { \|bm\| bm.report { Rails.application.assets["application.css"] } } user system total real 12.320000 0.530000 12.850000 ( 12.909684) ``` The result is faster page loads when changing CSS in development and faster precompilation.
* \| \| \| \| \| \| \|	Merge branch '19633-remove-rerun' into 'master'	Robert Speicher	2017-01-17	3	-15/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove rerun since it's not used anymore Closes #19633 See merge request !8598
\| * \| \| \| \| \| \| \|	Remove rerun since it's not used anymore19633-remove-rerun	Rémy Coutable	2017-01-16	3	-15/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch 'refresh-authorizations-tighter-lease' into 'master'	Robert Speicher	2017-01-17	3	-41/+44
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Synchronize all project authorization refreshing work using a lease Closes #25987 See merge request !8599
\| * \| \| \| \| \| \| \| \|	Synchronize all project authorization refreshingrefresh-authorizations-tighter-lease	Yorick Peterse	2017-01-16	3	-41/+44
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously a lease would only be obtained to update data. This could lead to duplicate data being inserted, triggering a UNIQUE constraint error. To work around this we now acquire a lease before performing _any_ project authorization work, releasing it at the very end. Fixes #25987
* \| \| \| \| \| \| \| \|	Merge branch 'boards-sidebar-spec-fix' into 'master'	Rémy Coutable	2017-01-17	1	-1/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed random issue boards sidebar failure Closes #26751 See merge request !8602
\| * \| \| \| \| \| \| \| \|	Fixed random issue boards sidebar failureboards-sidebar-spec-fix	Phil Hughes	2017-01-16	1	-1/+3
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch '26492-fix-transient-failure-in-commits_spec' into 'master'	Robert Speicher	2017-01-16	2	-3/+3
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update ffaker to ~>2.4 to avoid generating names with suffixes Closes #26492 See merge request !8596
\| * \| \| \| \| \| \| \|	Update ffaker to ~>2.4 to avoid generating names with suffixes26492-fix-transient-failure-in-commits_spec	Rémy Coutable	2017-01-16	2	-3/+3
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch '26616-fix-search-group-project-filters' into 'master'	Alfredo Sumaran	2017-01-16	4	-1/+30
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix search group/project filtering to show results Closes #26616 See merge request !8565
\| * \| \| \| \| \| \|	Fix dropdown filter input value after blur26616-fix-search-group-project-filters	Eric Eastwood	2017-01-16	4	-2/+25
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix group/project filters on search page	Eric Eastwood	2017-01-16	2	-1/+7
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'pipeline_index_mini_graph_fix' into 'master'	Fatih Acet	2017-01-16	1	-13/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pipeline Index Mini Graph Fix See merge request !8542
\| * \| \| \| \| \| \| \|	phil said this is good - no need to dynamically update since this is a ↵pipeline_index_mini_graph_fix	Regis	2017-01-15	1	-49/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	static page for now
\| * \| \| \| \| \| \| \|	works in browsers without sourceCapabilities API	Regis	2017-01-15	1	-1/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	update commented documentation to reflect new changes	Regis	2017-01-15	1	-2/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' into pipeline_index_mini_graph_fix	Regis	2017-01-15	1	-1/+1
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	fix clicking url bar, browser UI, dev tools collapsing the mini_graph	Regis	2017-01-15	1	-1/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	fix UI without Promise or timeOut/interval	Regis	2017-01-15	1	-2/+9
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	fix UI behaviour	Regis	2017-01-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' into pipeline_index_mini_graph_fix	Regis	2017-01-15	245	-2922/+8355
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	make tests pass - change a bit of logic	Regis	2017-01-12	1	-6/+8
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	fixed issue - description in function (check diff)	Regis	2017-01-12	1	-3/+23
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'sandish/gitlab-ce-update_ret_val' into 'master'	Robert Speicher	2017-01-16	7	-114/+85
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure updating project settings shows a flash message on success See merge request !8579
\| * \| \| \| \| \| \| \| \| \| \|	Add a spec and actually display the flash notice	Rémy Coutable	2017-01-16	6	-116/+82
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \| \| \| \|	Fix to display notice when project settings updated.	sandish chen	2017-01-15	4	-3/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change validity checking for UpdateService. Add return value for project update service. Return 302(redirect_to) when successfully updated. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '26207-add-hover-animations' into 'master'	Annabel Dunstone Gray	2017-01-16	12	-9/+145
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add Hover animations" Closes #26207 See merge request !8415