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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'expand-backlog-closed-lists-issue-boards' into 'master'	Douwe Maan	2017-06-07	31	-143/+402
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Expand/collapse close & backlog lists in issue boards Closes #23917 See merge request !11820
\| *	change tests based on backend feedbackexpand-backlog-closed-lists-issue-boards	Phil Hughes	2017-06-07	1	-10/+4
\| \|
\| *	updated service spec	Phil Hughes	2017-06-06	3	-9/+33
\| \|
\| *	moved creating backlog list into list service	Phil Hughes	2017-06-06	4	-4/+6
\| \|
\| *	added tests for collapsing	Phil Hughes	2017-06-02	3	-1/+141
\| \|
\| *	changed the icon for the collapsed backlog list	Phil Hughes	2017-06-01	4	-3/+8
\| \| \| \| \| \| \| \|	[ci skip]
\| *	fixed boards specs	Phil Hughes	2017-06-01	5	-8/+9
\| \| \| \| \| \| \| \|	added key to assignee avatar loop
\| *	fixed issue_ordering_spec	Phil Hughes	2017-06-01	1	-18/+18
\| \|
\| *	fixed boards_spec	Phil Hughes	2017-06-01	1	-89/+85
\| \| \| \| \| \| \| \|	[ci skip]
\| *	fixed new_issue_spec	Phil Hughes	2017-06-01	1	-3/+3
\| \| \| \| \| \| \| \|	[ci skip]
\| *	spec updates	Phil Hughes	2017-05-31	7	-6/+22
\| \|
\| *	Expand/collapse close & backlog lists in issue boards	Phil Hughes	2017-05-31	12	-10/+91
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The closed & backlog lists in issue boards are no collapsible. They can be collapsed independently of each other & this selection is then saved to the browser through localStorage. When the page loads, the code gets the data from localStorage & determines whether to show or hide the list Closes #23917
* \|	Merge branch 'fix_rubocop_warning_about_has_key' into 'master'	Grzegorz Bizon	2017-06-07	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Use key? instead of has_key? See merge request !11971
\| * \|	Use key? instead of has_key? methodfix_rubocop_warning_about_has_key	Pawel Chojnacki	2017-06-07	1	-1/+1
\| \| \|
* \| \|	Merge branch 'backport-ee-fix-settings-scss' into 'master'	Phil Hughes	2017-06-07	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport settings.scss bug fix from EE branch See merge request !11969
\| * \| \|	set overflow:visible to prevent dropdowns from getting cut offbackport-ee-fix-settings-scss	Mike Greiling	2017-06-07	1	-1/+1
\| \|/ /
* \| \|	Merge branch '3191-deploy-keys-update' into 'master'	Rémy Coutable	2017-06-07	27	-154/+491
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement ability to update deploy keys Closes #3191 See merge request !10383
\| * \| \|	Implement ability to update deploy keys	Alexander Randa	2017-06-02	27	-154/+491
\| \| \| \|
* \| \| \|	Merge branch 'gitaly-0.11.0' into 'master'	Sean McGivern	2017-06-07	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Gitaly 0.11.0 See merge request !11966
\| * \| \| \|	Use Gitaly 0.11.0	Jacob Vosmaer	2017-06-07	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'issue_27166_2' into 'master'	Douwe Maan	2017-06-07	4	-6/+37
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid repeated queries for pipeline builds on merge requests See merge request !11888
\| * \| \| \|	Avoid repeated queries for pipeline builds on merge requestsissue_27166_2	Felipe Artur	2017-06-06	4	-6/+37
\| \| \| \| \|
* \| \| \| \|	Merge branch 'dm-diff-file-straight-diff' into 'master'	Sean McGivern	2017-06-07	8	-23/+128
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Diff::Position#diff_file for positions on straight diffs See merge request !11947
\| * \| \| \| \|	Fix Diff::Position#diff_file for positions on straight diffsdm-diff-file-straight-diff	Douwe Maan	2017-06-06	8	-23/+128
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'feature/gb/persist-pipeline-stages' into 'master'	Kamil Trzciński	2017-06-07	29	-162/+365
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Persist stages in the database Closes #26481 See merge request !11790
\| * \| \| \| \| \|	Fix retry build service specs related to the stagefeature/gb/persist-pipeline-stages	Grzegorz Bizon	2017-06-07	1	-3/+15
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'feature/gb/migrate-pipeline-stages' into ↵	Grzegorz Bizon	2017-06-06	204	-1836/+4140
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/gb/persist-pipeline-stages * feature/gb/migrate-pipeline-stages: (76 commits) redesign caching of application settings Fix binary encoding error on MR diffs Fix missing tooltip and ARIA labels for accessibility Add info on using self-signed certs with Registry Actually clean gitlab-test path when TestEnv.set_repo_refs fails Introduce optimistic locking support via optional parameter last_commit_id on File Update API Move issuable bulk edit form into a new sidebar. Add PowerShell to CI variable docs Responsive environment tables Accept a username for User-level Events API Introduce an Events API Update GitLab Pages to v0.4.3 Allow numeric pages domain Remove references to old settings location Resolve "API: Environment info missed" Fix Projects API spec Resolve "When changing project visibility setting, change other dropdowns automatically" Update explanation of job-level variable override to fit example change headings to improve SEO backports changed import logic from pull mirroring feature into CE ...
\| * \| \| \| \| \| \|	Add changelog for persistent stages improvement	Grzegorz Bizon	2017-06-06	1	-0/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'feature/gb/migrate-pipeline-stages' into ↵	Grzegorz Bizon	2017-06-06	2	-2/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/gb/persist-pipeline-stages * feature/gb/migrate-pipeline-stages: Fix reverting builds stage ref migration on MySQL
\| * \| \| \| \| \| \| \|	Clone stage_id when retrying a CI/CD job	Grzegorz Bizon	2017-06-06	2	-3/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'feature/gb/migrate-pipeline-stages' into ↵	Grzegorz Bizon	2017-06-06	9	-51/+60
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/gb/persist-pipeline-stages * feature/gb/migrate-pipeline-stages: Migrate stages only with correct foreign references Create index on pipeline stages after migrating stages Improve indexes and refs in pipeline stages migrations Fix typo in build stages reference migration Improve order of columns in pipeline stages table Make pipeline stages ref migration more readable
\| * \| \| \| \| \| \| \| \|	Improve specs for pipeline and pipeline seeds	Grzegorz Bizon	2017-06-05	2	-3/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix typo in import/export safe model attributes	Grzegorz Bizon	2017-06-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'feature/gb/migrate-pipeline-stages' into ↵	Grzegorz Bizon	2017-06-05	5	-6/+26
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/gb/persist-pipeline-stages * feature/gb/migrate-pipeline-stages: Use the latest migration version as a schema version Remove stage index concurrently on migration rollback Disable timeouts in foreign keys for stages migration Remove obsolete stages/build before adding foreign keys Create indexes on pipeline stages before migration Migrate stage_id only it job does not have it already Migrate pipeline stages only when not migrated already
\| * \ \ \ \ \ \ \ \ \	Merge branch 'feature/gb/migrate-pipeline-stages' into ↵	Grzegorz Bizon	2017-06-05	4	-5/+15
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/gb/persist-pipeline-stages * feature/gb/migrate-pipeline-stages: Calculate previous migration version in specs support Conflicts: spec/spec_helper.rb
\| * \| \| \| \| \| \| \| \| \| \|	Add assertions about new pipeline stage in specs	Grzegorz Bizon	2017-06-05	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into feature/gb/persist-pipeline-stages	Grzegorz Bizon	2017-06-05	1053	-6751/+20984
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (524 commits) Improve user experience around slash commands in instant comments Fix LFS timeouts when trying to save large files retryable? is now available for CommitStatus Resolve "Documentation of `.gitlab-ci.yml` states incorrect example for variables" Fix test failures Add slugify project path to CI enviroment variables Fixed typo: craeted -> created 32118 Make New environment empty state btn lowercase Expose import_status in Projects API 32832 Remove overflow from comment form for confidential issues and vertically aligns confidential issue icon Fix test failures Allow manual bypass of auto_sign_in_with_provider Fix keys seed Allow users to be hard-deleted from the API fixup some classnames and media queries Enable the Style/PreferredHashMethods cop Lint our factories creation in addition to their build Don’t schedule workers from inside transactions Allow scheduling from after_commit hooks Forbid Sidekiq scheduling in transactions ... Conflicts: app/serializers/pipeline_entity.rb db/schema.rb spec/factories/ci/stages.rb spec/lib/gitlab/import_export/safe_model_attributes.yml spec/services/ci/create_pipeline_service_spec.rb spec/spec_helper.rb
\| * \| \| \| \| \| \| \| \| \| \| \|	Export pipeline stages in import/export feature	Grzegorz Bizon	2017-06-05	4	-0/+16
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Revert invalid changes in new pipeline service specs	Grzegorz Bizon	2017-06-05	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Remove legacy method from pipeline class	Grzegorz Bizon	2017-06-05	1	-11/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix invalid conditional in pipeline create service	Grzegorz Bizon	2017-06-02	3	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Refine implementation of pipeline stage seeds	Grzegorz Bizon	2017-06-02	12	-205/+172
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'feature/gb/migrate-pipeline-stages' into ↵	Grzegorz Bizon	2017-06-01	2	-1/+3
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/gb/persist-pipeline-stages * feature/gb/migrate-pipeline-stages: Use stage_id column in code that needs to know about it
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix exposing legacy stages in pipeline entity	Grzegorz Bizon	2017-06-01	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Rename `Ci::Stage` class to `Ci::LegacyStage`	Grzegorz Bizon	2017-06-01	5	-7/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Rename pipeline methods related to legacy stages	Grzegorz Bizon	2017-06-01	8	-23/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Expose pipeline stage seeds from pipeline instance	Grzegorz Bizon	2017-05-31	2	-5/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Return stage seeds object from YAML processor	Grzegorz Bizon	2017-05-31	5	-26/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Refine pipeline stages seeds class	Grzegorz Bizon	2017-05-31	5	-86/+121
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Add stage seed class that represents attributes	Grzegorz Bizon	2017-05-30	3	-2/+86
\| \| \| \| \| \| \| \| \| \| \| \| \| \|