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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Updated Rubocop for generator_templates/fix-generator-templates-directory	Yorick Peterse	2016-05-19	1	-1/+1
\|
*	Move generator templates to generator_templates/	Yorick Peterse	2016-05-19	3	-1/+3
\| \| \| \| \| \|	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 'simplify-animation-css' into 'master'	Jacob Schatz	2016-05-19	5	-12/+74
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace animate.css with a smaller subset of animations. As discussed in #15667. This saves ~50KB uncompressed. cc: @jschatz1 See merge request !3937
\| *	Replace animate.css with a smaller subset of animations.	Connor Shea	2016-05-13	5	-12/+74
\| \| \| \| \| \| \| \|	As discussed in #15667.
* \|	Merge branch 'doc-broken-links' into 'master'	Jeroen van Baarsen	2016-05-19	3	-2/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken documentation links Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15249 - [x] `/help/ui`- This is working for me - [x] `/help/ci/examples/deployment/README.md` - Fixed - [x] `/help/ci/api/projects.md` - Fixed - [x] `/help/markdown/LICENSE` - Cannot do much to fix it, added a note. - [x] `/help/ci/ssh/README.md` - Cannot find this link referenced anywhere. See merge request !3903
\| * \|	Fix broken linksdoc-broken-links	Achilleas Pipinellis	2016-04-19	3	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch 'patch-1' into 'master'	Rémy Coutable	2016-05-19	2	-1/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \|	Added CHANGELOG entry	Ludovic Perrine	2016-05-19	1	-0/+1
\| \| \| \|
\| * \| \|	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	6	-2/+393
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-5/+7
\| \| \| \| \|
\| * \| \| \|	Tell Rubocop to ignore lib/templates	Yorick Peterse	2016-05-12	1	-1/+2
\| \| \| \| \|
\| * \| \| \|	Link to migration guide in migration templates	Yorick Peterse	2016-05-12	2	-0/+6
\| \| \| \| \|
\| * \| \| \|	Updated migration styleguide for new helpers	Yorick Peterse	2016-05-12	1	-2/+44
\| \| \| \| \|
\| * \| \| \|	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	2	-0/+256
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \|	Merge branch 'fix-svg-constant-errors' into 'master'	Robert Speicher	2016-05-19	2	-89/+89
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix warning messages with SVG ALLOWED_ELEMENTS Define the right module names so that Rails autoloading and eager loading will work properly. Eliminates "warning: already initialized constant Gitlab::Sanitizers::SVG::ALLOWED_ELEMENTS" See merge request !4207
\| * \| \| \| \|	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 'mooreniemi/gitlab-ce-issue_15236' into 'master'	Robert Speicher	2016-05-19	5	-12/+49
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changing the confidentiality of an issue now creates a new system note Closes #15236. See merge request !4189
\| * \| \| \| \| \|	Move #create_confidentiality_note to Issues::UpdateServicemooreniemi/gitlab-ce-issue_15236	Rémy Coutable	2016-05-18	5	-32/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \|	Changing the confidentiality of an issue now creates a new system note	Alex Moore-Niemi	2016-05-18	6	-7/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch 'revert-3656b5db' into 'master'	Stan Hu	2016-05-19	2	-1/+5
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'issues/15127' into 'master'" This reverts merge request !3647 See merge request !4212
\| * \| \| \| \| \|	Revert "Merge branch 'issues/15127' into 'master'"revert-3656b5db	Stan Hu	2016-05-19	2	-1/+5
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !3647
* \| \| \| \| \|	Merge branch 'issues/15127' into 'master'	Stan Hu	2016-05-19	2	-5/+1
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix #15127 ActiveJob::DeserializationError thrown `send_devise_notification` pre-maturely enqueued the task when the user instance has not yet been committed into the database, causing a record-not-found in the other sidekiq process. `devise-async` has already been taking care of asynchronous mail sending, we just need to run it inside queue `mailers` instead of `mailer` to enable it. The implementation of `devise-async` enqueues the task in `after_commit` hook which is the right way to do it. See merge request !3647
\| * \| \| \| \|	fix #15127 ActiveJob::DeserializationError thrown	P.S.V.R	2016-04-11	2	-5/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	send_devise_notification pre-maturely enqueued the task when the user instance has not yet been committed into the database, causing a record-not-found in the other sidekiq process. devise-async has already been taking care of asynchronous mail sending, we just need to run it inside queue `mailers` instead of `mailer` to enable it.
* \| \| \| \| \|	Merge branch 'issue_17560' into 'master'	Robert Speicher	2016-05-19	7	-33/+107
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	7	-33/+107
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '17635-remove-unused-project-scopes' into 'master'	Robert Speicher	2016-05-19	1	-25/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused Project scopes Closes #17635. See merge request !4204
\| * \| \| \| \| \| \|	Remove unused Project scopes17635-remove-unused-project-scopes	Rémy Coutable	2016-05-18	1	-25/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'fix-changelog' into 'master'	Rémy Coutable	2016-05-18	1	-8/+5
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix changelog for 7.9.3 Closes #1484 See merge request !4202
\| * \| \| \| \| \| \|	Fix changelog for 7.9.3 [ci-skip]	Robert Schilling	2016-05-18	1	-8/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' into 'master'	Hannes Rosenögger	2016-05-18	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix example urls for (dis)associating runners to projects See merge request !2993
\| * \| \| \| \| \| \|	fix example urls for (de)associating runners to projects	a-tal	2016-02-26	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'patch-1' into 'master'	Hannes Rosenögger	2016-05-18	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	doc: fix git lfs workaround for using http instead of https the url should only point to `info/lfs` instead of `info/lfs/batch/objects` See merge request !2713
\| * \| \| \| \| \| \| \|	doc: fix git lfs workaround for using http instead of https	Felix Ruess	2016-02-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the url should only point to `info/lfs` instead of `info/lfs/batch/objects`
* \| \| \| \| \| \| \| \|	Merge branch '17628-remove-unused-methods' into 'master'	Robert Speicher	2016-05-18	1	-9/+0
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove User#tm_in_authorized_projects and User#tm_of These methods seems to be unused. Closes #17628. Signed-off-by: Rémy Coutable <remy@rymai.me> See merge request !4198
\| * \| \| \| \| \| \| \| \|	Remove User#tm_in_authorized_projects and User#tm_of	Rémy Coutable	2016-05-18	1	-9/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These methods seems to be unused. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \|	Merge branch '15584-remove-back-compat-code' into 'master'	Robert Speicher	2016-05-18	1	-5/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove back-compat code that's not needed anymore Solves #15584. See merge request !4187
\| * \| \| \| \| \| \| \| \|	Remove back-compat code that's not needed anymore15584-remove-back-compat-code	Rémy Coutable	2016-05-17	1	-5/+1
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch 'docker-registry-view' into 'master'	Kamil Trzciński	2016-05-18	41	-22/+954
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 branch 'master' into docker-registry-viewdocker-registry-view	Kamil Trzcinski	2016-05-18	2	-0/+3
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Verify if registry is enabled in registry	Kamil Trzcinski	2016-05-18	2	-1/+6
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Improve code design	Kamil Trzcinski	2016-05-18	2	-5/+9
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Provide full test coverage to lib/container_registry API implementation	Kamil Trzcinski	2016-05-17	11	-57/+232
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add .gitkeep	Kamil Trzcinski	2016-05-17	6	-2/+48
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix specs	Kamil Trzcinski	2016-05-16	3	-2/+10
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix rubocop offenses	Kamil Trzcinski	2016-05-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \|