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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Backend for a gitignores dropdown	Zeger-Jan van de Weg	2016-05-20	5	-0/+132
\|
*	Merge branch 'feature/runner-config-untagged-jobs' into 'master'	Robert Speicher	2016-05-19	3	-10/+11
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add config for CI Runner that prevents it from picking untagged jobs Closes #3456 See merge request !4039
\| *	Add minor corrections related to config of runner	Grzegorz Bizon	2016-05-19	1	-1/+1
\| \|
\| *	Improve setting default runner attrs when using API	Grzegorz Bizon	2016-05-19	1	-2/+5
\| \|
\| *	Set run untagged option when registering a runner	Grzegorz Bizon	2016-05-19	1	-9/+6
\| \|
\| *	Extend runner options that are configurable via API	Grzegorz Bizon	2016-05-19	2	-1/+2
\| \|
* \|	Merge branch 'fix-generator-templates-directory' into 'master'	Jeroen van Baarsen	2016-05-19	2	-90/+0
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move generator templates to generator_templates/ See merge request !4217
\| * \|	Move generator templates to generator_templates/	Yorick Peterse	2016-05-19	2	-90/+0
\| \|/ \| \| \| \| \| \| \| \| \| \|	Since we eager load everything in lib/ putting ERB code in .rb files will result in syntax errors. By moving the templates to ./generator_templates we can work around this.
* \|	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 'patch-1' into 'master'	Rémy Coutable	2016-05-19	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed advice on invalid permissions on upload path When running the checks, my upload path has wrong permissions, the advice could not fix it because it does not change the permission of this directory (only sub-directories). ``` Uploads directory setup correctly? ... no Try fixing it: sudo find /home/git/gitlab/public/uploads -type d -not -path /home/git/gitlab/public/uploads -exec chmod 0700 {} \; For more information see: doc/install/installation.md in section "GitLab" Please fix the error above and rerun the checks. ``` Executing this instead fixed the error : ``` sudo chmod 700 /home/git/gitlab/public/uploads ``` See merge request !2948
\| * \|	Fixed advice on invalid permissions on upload path	Jazz	2016-05-19	1	-1/+1
\| \| \|
* \| \|	Merge branch 'migration-helpers' into 'master'	Robert Speicher	2016-05-19	3	-0/+224
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \|	Fixed typos in migration templatesmigration-helpers	Yorick Peterse	2016-05-19	2	-2/+2
\| \| \| \|
\| * \| \|	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
\| \| \| \|
\| * \| \|	Link to migration guide in migration templates	Yorick Peterse	2016-05-12	2	-0/+6
\| \| \| \|
\| * \| \|	Added custom migration generator templates	Yorick Peterse	2016-05-12	2	-0/+84
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows us to automatically include Gitlab::Database::MigrationHelpers into newly generated migrations.
\| * \| \|	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	10	-1/+310
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \|	Provide full test coverage to lib/container_registry API implementation	Kamil Trzcinski	2016-05-17	5	-54/+14
\| \| \| \|
\| * \| \|	Add .gitkeep	Kamil Trzcinski	2016-05-17	4	-2/+20
\| \| \| \|
\| * \| \|	Improve test coverage	Kamil Trzcinski	2016-05-16	1	-1/+1
\| \| \| \|
\| * \| \|	Added backup of container registry	Kamil Trzcinski	2016-05-16	3	-1/+35
\| \| \| \|
\| * \| \|	Merge remote-tracking branch 'origin/master' into docker-registry-view	Kamil Trzcinski	2016-05-16	7	-66/+110
\| \|\ \ \ \| \| \|/ /
\| * \| \|	Fix path to tag	Kamil Trzcinski	2016-05-16	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'docker-registry' into docker-registry-view	Kamil Trzcinski	2016-05-14	2	-6/+10
\| \|\ \ \
\| * \ \ \	Merge branch 'docker-registry' into docker-registry-view	Kamil Trzcinski	2016-05-13	28	-344/+362
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'docker-registry' into docker-registry-view	Kamil Trzcinski	2016-05-13	1	-4/+6
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/controllers/jwt_controller.rb # app/services/jwt/container_registry_authentication_service.rb
\| * \| \| \| \| \|	Fix CI tests	Kamil Trzcinski	2016-05-12	2	-2/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'docker-registry' into docker-registry-view	Kamil Trzcinski	2016-05-12	2	-3/+3
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Added Docker Registry View tests	Kamil Trzcinski	2016-05-09	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix review comments	Kamil Trzcinski	2016-05-09	2	-15/+19
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Simplify Container Registry view implementation	Kamil Trzcinski	2016-05-09	4	-1/+14
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Rename ImageRegistry to ContainerRegistry	Kamil Trzcinski	2016-05-09	6	-13/+13
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'docker-registry' into docker-registry-view	Kamil Trzcinski	2016-05-09	20	-375/+406
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	WIP	Kamil Trzcinski	2016-05-08	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix bearer token support	Kamil Trzcinski	2016-05-04	2	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Allow to copy all manifests from one container repository to another	Kamil Trzcinski	2016-05-04	4	-5/+38
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove container registry on project removal	Kamil Trzcinski	2016-05-04	1	-1/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Implement Container Registry API client	Kamil Trzcinski	2016-05-04	7	-38/+240
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Added docker registry view	Kamil Trzcinski	2016-05-04	2	-0/+42
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	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	2	-5/+8
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix/import-data-issue
\| * \ \ \ \ \ \ \ \ \	Merge branches 'fix/import-data-issue' and 'master' of ↵	James Lopez	2016-05-11	14	-231/+192
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gitlab.com:gitlab-org/gitlab-ce into fix/import-data-issue