summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* fix changelog and mergefix/import-url-uri-issueJames Lopez2016-05-231-1/+1
|
* Extend comment for migrations helper MySQL fixGrzegorz Bizon2016-05-221-1/+8
|
* Add MySQL compatibility fix in migration helpersGrzegorz Bizon2016-05-221-1/+2
|
* Merge branch 'zj-gitignore-dropdown'Douwe Maan2016-05-201-0/+56
|\
| * Update API and fetching taskZeger-Jan van de Weg2016-05-201-26/+14
| |
| * Backend for a gitignores dropdownZeger-Jan van de Weg2016-05-201-0/+68
| |
* | Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'Douwe Maan2016-05-201-7/+29
|\ \ | |/ |/| | | | | # Conflicts: # app/services/system_note_service.rb
| * Reuse existing SCSS variablesadambutler/gitlab-ce-feature/support-diff-of-issue-title-renameRémy Coutable2016-05-181-2/+12
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Create DiffFilter and change SystemNoteService#change_title to use ↵Adam Butler2016-05-181-7/+19
| | | | | | | | Gitlab::Diff::InlineDiff
* | Merge branch '17464-backport-email-syntax-highlighting' into 'master' Douwe Maan2016-05-191-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-highlightingSean McGivern2016-05-171-1/+6
| | | | | | | | | | | | | | | Based on: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151
* | | Removed outdated comment from migration helpersfix-migration-helper-commentYorick Peterse2016-05-191-1/+1
| | |
* | | Merge branch 'migration-helpers' into 'master' Robert Speicher2016-05-191-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_heredocYorick Peterse2016-05-191-1/+1
| | | |
| * | | Removed stray strip_heredoc from migration helpersYorick Peterse2016-05-131-1/+1
| | | |
| * | | Fixed styling per Rubocop pedanticsYorick Peterse2016-05-121-1/+3
| | | |
| * | | Added helper methods for database migrationsYorick Peterse2016-05-121-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_ELEMENTSStan Hu2016-05-192-89/+89
| | | | | | | | | | | | | | | | Eliminates "warning: already initialized constant Gitlab::Sanitizers::SVG::ALLOWED_ELEMENTS"
* | | | Merge branch 'issue_17560' into 'master' Robert Speicher2016-05-191-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ávila2016-05-181-2/+15
| | |/ / | |/| |
* | | | Merge branch 'docker-registry-view' into 'master' Kamil Trzciński2016-05-181-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-viewKamil Trzcinski2016-05-165-63/+105
| |\ \ \ | | |/ /
| * | | Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski2016-05-139-16/+17
| |\ \ \
| * \ \ \ Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski2016-05-097-26/+165
| |\ \ \ \
| * | | | | WIPKamil Trzcinski2016-05-081-1/+1
| | | | | |
| * | | | | Added docker registry viewKamil Trzcinski2016-05-041-0/+4
| | | | | |
* | | | | | Merge branch 'fix/import-data-issue' into 'master' Rémy Coutable2016-05-183-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 Lopez2016-05-121-2/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fix/import-data-issue
| * \ \ \ \ \ \ Merge branches 'fix/import-data-issue' and 'master' of ↵James Lopez2016-05-115-8/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into fix/import-data-issue
| * | | | | | | | create import data in serviceJames Lopez2016-05-103-17/+8
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | fix typo from bad refactoringJames Lopez2016-05-171-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge branch 'wiki-fix-reloaded' into 'master' Rémy Coutable2016-05-161-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 WikiArtem Sidorenko2016-05-131-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'gh-pull-requests'Douwe Maan2016-05-163-57/+97
|\ \ \ \ \ \ \
| * | | | | | | Remove branches that does exist on GitHub after PRs were importedDouglas Barbosa Alexandre2016-05-131-2/+3
| | | | | | | |
| * | | | | | | Fix validation method for Gitlab::GithubImport::PullRequestFormatterDouglas Barbosa Alexandre2016-05-132-3/+6
| | | | | | | |
| * | | | | | | Extract GitHub branch formatterDouglas Barbosa Alexandre2016-05-133-77/+52
| | | | | | | |
| * | | | | | | Import PRs where branch names were reused across PRsDouglas Barbosa Alexandre2016-05-131-4/+24
| | | | | | | |
| * | | | | | | Preserve commits/diff/comments for PRs that were merged on GitHubDouglas Barbosa Alexandre2016-05-131-0/+2
| | | | | | | |
| * | | | | | | Fix spec for Gitlab::GithubImport::PullRequestFormatterDouglas Barbosa Alexandre2016-05-132-6/+6
| | | | | | | |
| * | | | | | | Import pull requests from GitHub where the target branch was removedDouglas Barbosa Alexandre2016-05-132-12/+31
| | | | | | | |
| * | | | | | | Import pull requests from GitHub where the source branch was removedDouglas Barbosa Alexandre2016-05-132-27/+47
| |/ / / / / /
* | | | | | | Add cache count metrics to rails cacheadd-cache-count-metricsPablo Carranza2016-05-151-5/+7
|/ / / / / /
* | | | | | Codestyle: make sure we have space around operatorsGabriel Mazetto2016-05-132-4/+4
| | | | | |
* | | | | | Merge branch 'deprecated-class-methods-cop' into 'master' Robert Speicher2016-05-122-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable the Rubocop DeprecatedClassMethods cop This reports uses of `File.exists?` and `Dir.exists?`, which were both deprecated in Ruby and will eventually be removed in favor of `.exist?`. Also fixes all existing uses of the deprecated methods. See merge request !4087
| * | | | | Enable the Rubocop DeprecatedClassMethods copConnor Shea2016-05-082-2/+2
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | This reports uses of `File.exists?` and `Dir.exists?`, which were both deprecated in Ruby and will eventually be removed in favor of `.exist?`. Also fixes all existing uses of the deprecated methods.
* | | | | Removed tracking of total method execution timestotal-method-timeYorick Peterse2016-05-121-2/+0
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because method call timings are inclusive (that is, they include the time of any sub method calls) this would lead to the total method execution time often being far greater than the total transaction time. Because this is incredibly confusing it's best to simply _not_ track the total method execution time, after all it's not that useful to begin with. Fixes gitlab-org/gitlab-ce#17239
* | | | Merge branch '17270-only-generate-email-on-push-once-for-all-recipients' ↵Robert Speicher2016-05-111-3/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Only generate repository push email once The repository push email can be very expensive to generate, especially with syntax-highlighted diffs. Instead of generating the email for each recipient, generate one email object and reset the Message-Id and To headers for each recipient. (Cloning would also be expensive in the case of large emails, although probably not as bad as generating from scratch.) Closes #17270. See merge request !4070
| * | | | Only generate repository push email onceSean McGivern2016-05-111-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The repository push email can be very expensive to generate, especially with syntax-highlighted diffs. Instead of generating the email for each recipient, generate one email object and reset the Message-Id and To headers for each recipient. (Cloning would also be expensive in the case of large emails, although probably not as bad as generating from scratch.)
* | | | | Merge branch 'casecmp-cop' into 'master' Rémy Coutable2016-05-112-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Rubocop Casecmp Performance Cop. Also fixes the errors caused by enabling the cop. `casecmp` is more performant than `.downcase` and `==`. See also: https://github.com/bbatsov/rubocop/blob/master/lib/rubocop/cop/performance/casecmp.rb See merge request !3957