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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Use respond_to instead of a conditional to paginate milestonesfix/14505	Rémy Coutable	2016-03-23	3	-8/+9
\|
*	Fix an issue causing the Dashboard/Milestones page to be blank	Rémy Coutable	2016-03-22	7	-39/+20
\|
*	Merge branch 'drop_db_before_restore' into 'master'	Robert Speicher	2016-03-22	7	-26/+171
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reload the schema before restoring a database backup If a user tries to downgrade and restore after a failed upgrade, the database may still contain newer tables. Reload the older schema before restoring the database to avoid future upgrade problems. Also, add a rake task to help users add migration versions to the database so it's easier to recover from these errors if they do occur. Fixes #13419 See merge request !2807
\| *	Reload the schema before restoring a database backup	Drew Blessing	2016-03-21	7	-26/+171
\| \|
* \|	Merge branch 'delete-button-on-edit-issue-has-no-confirmation-14474' into ↵	Douwe Maan	2016-03-22	1	-1/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' User has to confirm deletion of issuables Closes #14474 See merge request !3341
\| * \|	User has to confirm deletion of issuables	Zeger-Jan van de Weg	2016-03-22	1	-1/+2
\| \| \|
* \| \|	Update CHANGELOG	Rémy Coutable	2016-03-22	1	-2/+9
\|/ / \| \| \| \| \| \|	[ci skip]
* \|	Merge branch 'doc_group_visibility' into 'master'	Achilleas Pipinellis	2016-03-22	1	-8/+15
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs on group visibility Accompanying https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3323 See merge request !3338
\| * \|	Add docs on group visibility	Achilleas Pipinellis	2016-03-22	1	-8/+15
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch 'gitlab_intro_docs' into 'master'	Achilleas Pipinellis	2016-03-22	9	-81/+163
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GitLab intro docs Related to https://gitlab.com/gitlab-org/marketing_monthly_release/issues/1 --- Need refactor: - Create a new project - Create a new group - Create a new issue - Assign labels to issues - Use milestones as an overview of your project's tracker - Fork a project and contribute to it - Create a new merge request - Automatically close issues from merge requests (include GitLab.com pattern) - GitLab CI quick start guide (make it easier to follow) Moved to https://gitlab.com/gitlab-org/gitlab-ce/issues/8068 See merge request !3225
\| * \|	Remove redundant word	Achilleas Pipinellis	2016-03-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \|	Refactor award emoji doc a bit	Achilleas Pipinellis	2016-03-22	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \|	Fix grammar in intro guide	Achilleas Pipinellis	2016-03-22	1	-2/+2
\| \| \|
\| * \|	Merge Git basics into Start using Git	Achilleas Pipinellis	2016-03-22	3	-59/+63
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \|	Add award emoji docs	Achilleas Pipinellis	2016-03-22	6	-1/+49
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \|	Change titles to be more descriptive	Achilleas Pipinellis	2016-03-22	1	-3/+3
\| \| \|
\| * \|	Remove blockquotes	Achilleas Pipinellis	2016-03-21	1	-5/+5
\| \| \|
\| * \|	Simplify install and update sectiongitlab_intro_docs	Achilleas Pipinellis	2016-03-19	1	-5/+2
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \|	Add h1 heading	Achilleas Pipinellis	2016-03-19	1	-0/+2
\| \| \|
\| * \|	Add more options and missing links	Achilleas Pipinellis	2016-03-19	1	-10/+12
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \|	Merge branch 'master' into gitlab_intro_docs	Achilleas Pipinellis	2016-03-19	333	-5274/+5171
\| \|\ \
\| * \| \|	No newlines between list items	Achilleas Pipinellis	2016-03-18	1	-23/+12
\| \| \| \|
\| * \| \|	First draft on GitLab intro docs	Achilleas Pipinellis	2016-03-15	1	-0/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Merge branch 'feature-ci-only-except-trigger' into 'master'	Kamil Trzciński	2016-03-22	4	-10/+66
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CI: Add 'triggers' keyword to 'only' and 'except' lists to allow control over when triggers cause builds to run Currently, the `only` and `except` keywords in `.gitlab-ci.yml` only accept ref names or the special `branches` and `tags` keywords. However, these are primarily useful when controlling how repository activity affects the creation of builds. In my case, instead of building on every commit, I'd like to use the following logic: - If the repository is tagged, do a build. - Any other normal commits should not cause a build. - If a build is triggered via the API, always create one for the specified ref. From what I can tell, this isn't possible via the existing YAML syntax. In this MR, I introduce a new keyword `triggers` that goes along with `branches` and `tags`. I can implement the logic above using the following job configuration: ```yaml only: - tags - triggers ``` I updated the tests and documentation to reflect this and everything seems to pass. See merge request !3230
\| * \| \| \|	make conditional a bit clearer	Jason Roehm	2016-03-15	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	fixed missing argument in list	Jason Roehm	2016-03-15	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	fix rubocop violation	Jason Roehm	2016-03-15	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	add some documentation for `triggers` keyword [ci skip]	Jason Roehm	2016-03-15	1	-1/+12
\| \| \| \| \|
\| * \| \| \|	add tests for only/except 'triggers' keyword	Jason Roehm	2016-03-15	1	-0/+44
\| \| \| \| \|
\| * \| \| \|	add 'triggers' keyword to gitlab-ci.yml 'only' and 'except' fields to allow ↵	Jason Roehm	2016-03-15	2	-8/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	control over whether triggers will cause jobs to run
* \| \| \| \|	Merge branch 'issue_12658' into 'master'	Robert Speicher	2016-03-22	1	-1/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Check if index exists before adding it I got an error when updating GDK because it already exists. [ci skip] See merge request !3335
\| * \| \| \| \|	Check if index exists before adding it. [ci skip]	Rubén Dávila	2016-03-21	1	-1/+3
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* I got an error when updating GDK because it already exists.
* \| \| \| \|	Merge branch 'issue_12658' into 'master'	Robert Speicher	2016-03-22	101	-977/+1538
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add group visibility level Supersedes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3051 Closes #12658 See merge request !3323
\| * \| \| \|	Fix specsissue_12658	Douwe Maan	2016-03-22	3	-11/+13
\| \| \| \| \|
\| * \| \| \|	Address feedback	Douwe Maan	2016-03-22	24	-100/+154
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' into issue_12658	Douwe Maan	2016-03-21	159	-761/+2015
\| \|\ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/models/issue.rb # app/views/projects/_home_panel.html.haml # app/views/shared/projects/_project.html.haml # db/schema.rb # spec/models/project_spec.rb
* \| \| \| \|	Merge branch 'change_css_class_has_tooltip_to_has-tooltip' into 'master'	Jacob Schatz	2016-03-21	34	-47/+47
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	change the css class has_tooltip to has-tooltip universally closes #14432 See merge request !3321
\| * \| \| \| \|	change the css class has_tooltip to has-tooltip universallychange_css_class_has_tooltip_to_has-tooltip	Arinde Eniola	2016-03-20	34	-47/+47
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'css-indentation' into 'master'	Jacob Schatz	2016-03-21	3	-9/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Indentation lints in CSS. As discussed in #14299. cc: @jschatz1 See merge request !3312
\| * \| \| \| \| \|	Fix Indentation lints in CSS.	connorshea	2016-03-18	3	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As discussed in #14299. [ci skip]
* \| \| \| \| \| \|	Merge branch 'ssh-page-ago' into 'master'	Jacob Schatz	2016-03-21	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove duplicated ago Closes #14460 See merge request !3332
\| * \| \| \| \| \| \|	Remove duplicated agossh-page-ago	Robert Schilling	2016-03-21	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'project-icon' into 'master'	Jacob Schatz	2016-03-21	3	-3/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changing project icon Closes #14196 See merge request !3268
\| * \| \| \| \| \| \| \|	Updated other views with new project iconproject-icon	Phil Hughes	2016-03-21	2	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Group page now uses correct project icon	Phil Hughes	2016-03-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #14196
* \| \| \| \| \| \| \| \|	Merge branch 'css-shorthand' into 'master'	Jacob Schatz	2016-03-21	10	-23/+23
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Follow the CSS Style Guide rules for using shorthand where possible. Fixes violations of the Shorthand rule. All of these were done manually and I reviewed each change to verify, so they should all be right. Discussed in #14299. cc: @jschatz1 See merge request !3313
\| * \| \| \| \| \| \| \| \|	Follow the CSS Style Guide rules for using shorthand where possible.	connorshea	2016-03-18	10	-23/+23
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes violations of Shorthand. Discussed in #14299. [ci skip]
* \| \| \| \| \| \| \| \|	Merge branch '2489-soft-delete-issues' into 'master'	Douwe Maan	2016-03-21	25	-38/+231
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Soft delete issuables Fixes #2489 What still needs to happen: research on the indexes, the gem suggests a [lot of changes](https://github.com/rubysherpas/paranoia#about-indexes) though this is probably a good idea to discuss and I'm unsure on the impact of an omnibus upgrade as I suspect creating about 10 new indexes has a large impact on the downtime. TODO: - [x] Also group owners can *soft* delete - [x] Button should be hidden See merge request !2982
\| * \ \ \ \ \ \ \ \	Merge branch 'master' into 2489-soft-delete-issues	Zeger-Jan van de Weg	2016-03-21	100	-647/+1708
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix typos and denting	Zeger-Jan van de Weg	2016-03-21	4	-12/+11
\| \| \| \| \| \| \| \| \| \|