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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Enable Style/Semicolon rubocop style copstyle/enable-semicolon-rubocop-cop	Grzegorz Bizon	2016-06-01	1	-1/+1
\| \| \| \|	See #17478
*	Add Application Setting to configure Container Registry token expire delay ↵	Kamil Trzcinski	2016-05-31	1	-0/+1
\| \| \| \|	(default 5min)
*	Merge branch 'rubocop/enable-literal-in-condition-cop' into 'master'	Robert Speicher	2016-05-30	1	-3/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable Lint/LiteralInCondition rubocop cop Detects literals used in conditions. See #17478 See merge request !4354
\| *	Enable Lint/LiteralInCondition rubocop coprubocop/enable-literal-in-condition-cop	Grzegorz Bizon	2016-05-30	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Checks of literals used in conditions. See #17478
* \|	Enable Style/WhileUntilDo rubocop style copstyle/enable-while-until-do-rubocop-style-cop	Grzegorz Bizon	2016-05-30	1	-1/+1
\|/ \| \| \|	See #17478
*	Merge branch 'fix/gitlab-importer-issue' into 'master'	Robert Speicher	2016-05-26	1	-3/+3
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix gitlab importer issue Fixed credentials not being called correctly - probably some bad refactoring or search & replace... Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/565 See merge request !4301
\| *	fix bad refactoring of import data credentials	James Lopez	2016-05-26	1	-3/+3
\| \|
* \|	Merge branch 'measure-proxy-timing' into 'master'	Yorick Peterse	2016-05-26	1	-0/+24
\|\ \ \| \|/ \|/\| \| \| \| \|	Measure proxy flight time See merge request !4278
\| *	Rename metric to 'rails queue duration'	Jacob Vosmaer	2016-05-26	1	-2/+2
\| \|
\| *	Align class name with field name	Jacob Vosmaer	2016-05-25	1	-1/+1
\| \|
\| *	Send data to InfluxDB instead of stdout	Jacob Vosmaer	2016-05-25	1	-4/+6
\| \|
\| *	Measure proxy timing: needs influxdb code	Jacob Vosmaer	2016-05-24	1	-0/+22
\| \|
* \|	Merge branch 'updated-contrib-calendar' into 'master'	Jacob Schatz	2016-05-25	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	POC: Updated contrib calendar In an effort to cut down the JS file size - i've removed the heatmap calendar used for the contributing calendar on users profiles. We already have d3 on the page so why not use it instead of using a library which uses it? ![Screen_Shot_2016-04-27_at_11.08.41](/uploads/64c40f0c766f800fd0e33ac8be7f9644/Screen_Shot_2016-04-27_at_11.08.41.png) cc. @jschatz1 See merge request !3944
\| * \|	Group the contributing calendar by day	Phil Hughes	2016-05-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	This aligns the boxes correctly with the day on the left side of the calendar
* \| \|	Merge branch 'fix/import-url-uri-issue' into 'master'	Douwe Maan	2016-05-25	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix for import URL URI problem when URL contains a space Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17559 Prevents an already encoded URL to be encoded again - preventing %20 => %25%20 See merge request !4180
\| * \| \|	fix changelog and mergefix/import-url-uri-issue	James Lopez	2016-05-23	1	-1/+1
\| \| \| \|
* \| \| \|	Fix forks creation when visibility level is restrictedissue_10725	Felipe Artur	2016-05-25	1	-0/+7
\| \|_\|/ \|/\| \|
* \| \|	Enable Performance/RangeInclude cop and fix single offensers-range-include	Robert Speicher	2016-05-23	1	-1/+1
\|/ /
* \|	Extend comment for migrations helper MySQL fix	Grzegorz Bizon	2016-05-22	1	-1/+8
\| \|
* \|	Add MySQL compatibility fix in migration helpers	Grzegorz Bizon	2016-05-22	1	-1/+2
\| \|
* \|	Merge branch 'zj-gitignore-dropdown'	Douwe Maan	2016-05-20	1	-0/+56
\|\ \
\| * \|	Update API and fetching task	Zeger-Jan van de Weg	2016-05-20	1	-26/+14
\| \| \|
\| * \|	Backend for a gitignores dropdown	Zeger-Jan van de Weg	2016-05-20	1	-0/+68
\| \| \|
* \| \|	Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'	Douwe Maan	2016-05-20	1	-7/+29
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	# Conflicts: # app/services/system_note_service.rb
\| * \|	Reuse existing SCSS variablesadambutler/gitlab-ce-feature/support-diff-of-issue-title-rename	Rémy Coutable	2016-05-18	1	-2/+12
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \|	Create DiffFilter and change SystemNoteService#change_title to use ↵	Adam Butler	2016-05-18	1	-7/+19
\| \| \| \| \| \| \| \| \| \| \| \|	Gitlab::Diff::InlineDiff
* \| \|	Merge branch '17464-backport-email-syntax-highlighting' into 'master'	Douwe Maan	2016-05-19	1	-1/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Syntax-highlight diffs in push emails ![image](/uploads/8ecbabc65382214b8de63aae24f66cea/image.png) Based on: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151 See merge request !4147
\| * \| \|	Syntax-highlight diffs in push emails17464-backport-email-syntax-highlighting	Sean McGivern	2016-05-17	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Based on: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151
* \| \| \|	Removed outdated comment from migration helpersfix-migration-helper-comment	Yorick Peterse	2016-05-19	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'migration-helpers' into 'master'	Robert Speicher	2016-05-19	1	-0/+134
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added helper methods for database migrations These helpers can ultimately be used to write migrations that don't require downtime. See #15464 for more information. See merge request !3860
\| * \| \| \|	Remove left-over use of strip_heredoc	Yorick Peterse	2016-05-19	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Removed stray strip_heredoc from migration helpers	Yorick Peterse	2016-05-13	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Fixed styling per Rubocop pedantics	Yorick Peterse	2016-05-12	1	-1/+3
\| \| \| \| \|
\| * \| \| \|	Added helper methods for database migrations	Yorick Peterse	2016-05-12	1	-0/+132
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These helpers can be used to perform migrations without taking down the entire application. For example, the method "add_column_with_default" can be used to add a new column with a default value without locking the entire table.
* \| \| \| \|	Fix warning messages with SVG ALLOWED_ELEMENTS	Stan Hu	2016-05-19	2	-89/+89
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Eliminates "warning: already initialized constant Gitlab::Sanitizers::SVG::ALLOWED_ELEMENTS"
* \| \| \| \|	Merge branch 'issue_17560' into 'master'	Robert Speicher	2016-05-19	1	-2/+15
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mask credentials from URL when the import of project has failed. REF: #17560 See merge request !4185
\| * \| \| \| \|	Mask credentials from URL when import of project has failed.	Rubén Dávila	2016-05-18	1	-2/+15
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'docker-registry-view' into 'master'	Kamil Trzciński	2016-05-18	1	-0/+4
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add container registry support Tasks: - [x] Merge docker/distribution authentication service: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3787 - [x] Implement Docker Registry API - [x] Show a list of docker images in GitLab - [x] Remove registry repository on project deletion - [x] Support project rename, move and namespace rename - [x] Use token when connecting the registry - [x] Allow to delete images from GitLab - [x] Support pushing from GitLab CI (gitlab-ci-token / $CI_BUILD_TOKEN) - [x] Support GitLab Runner pulling for public repositories - [ ] Support GitLab Runner pulling for private repositories - [x] Add tests for Docker Registry API - [x] Add tests for a views - [x] Make texts nicer - [x] Implement a backup support - [ ] Create administration documentation https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4141 - [ ] Create user documentation See merge request !4040
\| * \| \| \|	Merge remote-tracking branch 'origin/master' into docker-registry-view	Kamil Trzcinski	2016-05-16	5	-63/+105
\| \|\ \ \ \ \| \| \|/ / /
\| * \| \| \|	Merge branch 'docker-registry' into docker-registry-view	Kamil Trzcinski	2016-05-13	9	-16/+17
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'docker-registry' into docker-registry-view	Kamil Trzcinski	2016-05-09	7	-26/+165
\| \|\ \ \ \ \
\| * \| \| \| \| \|	WIP	Kamil Trzcinski	2016-05-08	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Added docker registry view	Kamil Trzcinski	2016-05-04	1	-0/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix/import-data-issue' into 'master'	Rémy Coutable	2016-05-18	3	-17/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create import data in service and fix timing issues when scheduling job Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17401 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17376 See merge request !4106
\| * \ \ \ \ \ \	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	James Lopez	2016-05-12	1	-2/+0
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix/import-data-issue
\| * \ \ \ \ \ \ \	Merge branches 'fix/import-data-issue' and 'master' of ↵	James Lopez	2016-05-11	5	-8/+6
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gitlab.com:gitlab-org/gitlab-ce into fix/import-data-issue
\| * \| \| \| \| \| \| \| \|	create import data in service	James Lopez	2016-05-10	3	-17/+8
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	fix typo from bad refactoring	James Lopez	2016-05-17	1	-1/+1
\| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'wiki-fix-reloaded' into 'master'	Rémy Coutable	2016-05-16	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the relative url prefix for links in Wiki Retry of gitlab-org/gitlab-ce!4026 @rymai !4050 solved all other problems how it looks like. I [tested](https://gitlab.com/artem-forks/gitlab-ce/commit/ff01eca7b559efa7cacf3412aa01cd8ae8a6db7e/builds) this with ruby22 Fixes #17071 See merge request !4131
\| * \| \| \| \| \| \| \|	Use the relative url prefix for links in Wiki	Artem Sidorenko	2016-05-13	1	-1/+1
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|