summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵spread-runner-last-updated-atJacob Vosmaer2015-11-0327-150/+347
|\ | | | | | | spread-runner-last-updated-at
| * Merge branch 'only-syntax' into 'master' Kamil Trzciński2015-11-035-111/+269
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend yml syntax for only and except to support specifying repository path This allows to limit execution of jobs to specific repository. For example: ```yaml job: only: - branches@gitlab-org/gitlab-ce except: - master@gitlab-org/gitlab-ce ``` The above will run `job` for all branches on `gitlab-org/gitlab-ce`, except master. @dzaporozhets @JobV @vsizov Please review. See merge request !1720
| | * Fix testsonly-syntaxKamil Trzcinski2015-11-031-15/+11
| | |
| | * SpellingKamil Trzcinski2015-11-021-1/+1
| | |
| | * Extend yml syntax for only and except to support specifying repository pathKamil Trzcinski2015-11-025-111/+273
| | |
| * | Merge branch 'fix-inflector' into 'master' Dmitriy Zaporozhets2015-11-033-23/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove inflector rule that makes commits uncountable Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Before: ``` >> "commits".singularize => "commits" >> "commit".pluralize => “commits” ``` After: ``` >> "commits".singularize => "commit" >> "commit".pluralize => “commits” ``` cc @rspeicher See merge request !1726
| | * | Fix code that depends on incorrect inflector behaviorDmitriy Zaporozhets2015-11-032-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Remove inflector rule that makes commits uncountableDmitriy Zaporozhets2015-11-031-21/+0
| |/ / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Merge branch 'olhado/gitlab-ce-commit-search'Dmitriy Zaporozhets2015-11-0310-6/+52
| |\ \
| | * | Fix commits search for empty repositoryDmitriy Zaporozhets2015-11-031-1/+5
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Refactor search by commits messageolhado/gitlab-ce-commit-searchDmitriy Zaporozhets2015-11-027-41/+11
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Actually converted code to following suggestions.Michael Chmielewski2015-10-282-7/+4
| | | |
| | * | Fixed method to use git log via Popen as recommended, and made output match ↵Michael Chmielewski2015-10-282-2/+7
| | | | | | | | | | | | | | | | test (and thus system) expectations.
| | * | Trying to incorporate suggestions from comments on Merge Request 1661Michael Chmielewski2015-10-283-7/+8
| | | |
| | * | Trailing new lines at ends of files are important.Michael Chmielewski2015-10-281-1/+1
| | | |
| | * | Moved changelog entry to 8.2Michael Chmielewski2015-10-281-1/+3
| | | |
| | * | Added @commits to list of tags.Mike Chmielewski2015-10-281-3/+3
| | | |
| | * | Make subject of spec line up on one line to satisfy rubocop requirementsMike Chmielewski2015-10-281-4/+2
| | | |
| | * | Add support for searching commit log messagesJonathan Schoeffling2015-10-288-3/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include the log messages of recent commits in project-level search results, providing functionality similar to 'git log --grep'. Update repository model rspec tests to validate the output of Repository#commits_with_log_matching.
| * | | Merge branch 'new-file-link' into 'master' Dmitriy Zaporozhets2015-11-032-0/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 'New file' link to dropdown on project page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Screenshot: ![Screenshot_2015-11-02_15.33.41](/uploads/ecc87c6bda9e3f0680e5422d5cdc08f9/Screenshot_2015-11-02_15.33.41.png) Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2562 See merge request !1719
| | * | | Add 'New file' link to dropdown on project pageDmitriy Zaporozhets2015-11-032-0/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Merge branch 'update-links-to-ci-status' into 'master' Kamil Trzciński2015-11-034-8/+8
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update links in CI docs after GitLab 8.1 Fix that some links to CI status in docs were broken even after following redirects. As CI build overview is now missing (cf. #3008), this MR uses `?scope=all` parameter. See merge request !1733
| | * | | Update links in CI docs after GitLab 8.1Takuya Noguchi2015-11-034-8/+8
| | | | |
| * | | | Merge branch 'rs-require-backup-files' into 'master' Dmitriy Zaporozhets2015-11-032-0/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly require backup/files Fixes a test failure we were seeing on CI after merging !1520 See merge request !1731
| | * | | | Explicitly require backup/filesrs-require-backup-filesRobert Speicher2015-11-022-0/+4
| | |/ / /
| * | | | Merge pull request #9791 from konpyu/fix-deprecatedStan Hu2015-11-021-1/+1
| |\ \ \ \ | | |/ / / | |/| | | Fix deprecated `prepend_before_filter` -> `prepend_before_action`
| | * | | fix deprecatedKON YUICHI2015-10-311-1/+1
| | | | |
| * | | | Merge branch 'api_file_touched_at' into 'master' Dmitriy Zaporozhets2015-11-024-2/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ability to fetch the commit ID of the last commit that actually touched a file https://dev.gitlab.org/gitlab/gitlabhq/issues/2564 See merge request !1718
| | * | | | Add ability to fetch the commit ID of the last commit that actually touched ↵api_file_touched_atValery Sizov2015-11-024-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | a file
* | | | | | Add changelog entry for contacted_atJacob Vosmaer2015-11-021-0/+3
| | | | | |
* | | | | | Spread out runner contacted_at updatesJacob Vosmaer2015-11-021-1/+3
|/ / / / /
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-11-0210-110/+200
|\ \ \ \ \
| * \ \ \ \ Merge branch 'backup-improvements' into 'master' Kamil Trzciński2015-11-026-92/+82
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce disk IO and space usage during backups This is based on improvements made to the GitLab CI 8.0 backup script. - Avoid creating many small intermediate files while backing up builds and uploads by using tar and light gzip compression - Use same backup/restore code for uploads and builds - Only store a compressed intermediate DB dump See merge request !1520
| | * | | | Do no rely on basename of builds, uploadsbackup-improvementsJacob Vosmaer2015-10-163-6/+15
| | | | | |
| | * | | | One more backup spec fixJacob Vosmaer2015-10-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Stop the 'uploads' part from actually running.
| | * | | | Spec fixes for new backup contentsJacob Vosmaer2015-10-061-7/+7
| | | | | |
| | * | | | Remove superfluous mkdir -pJacob Vosmaer2015-10-061-2/+0
| | | | | |
| | * | | | Remove unused variableJacob Vosmaer2015-10-061-3/+2
| | | | | |
| | * | | | Keep old path: db/database.sql.gzJacob Vosmaer2015-10-062-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation elsewhere refers to this internal path, let's keep it.
| | * | | | Remove old "files" tarball explicitlyJacob Vosmaer2015-10-061-0/+1
| | | | | |
| | * | | | Reduce disk IO during SQL backupJacob Vosmaer2015-10-062-31/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By using light gzip compression we can save a lot of disk IO during the backup.
| | * | | | Use tar for intermediate backup storageJacob Vosmaer2015-10-064-59/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During the backup we create an intermediate copy of two directories: builds and uploads. Instead of creating many small files with 'cp -r', we now use tar (and fast gzip) to create single intermediate files. This saves on disk IO and disk space while creating a backup.
| * | | | | Merge branch 'rs-dev-issue-2613' into 'master' Douwe Maan2015-11-022-10/+110
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add custom protocol whitelisting to SanitizationFilter Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2613 We allow any protocol for autolinks: irc://irc.freenode.net/git But manual Markdown links with the same protocol get sanitized: `[This will not be clickable](irc://irc.freenode.net/git)`: [This will not be clickable](irc://irc.freenode.net/git) To get around this we have to first allow *all* protocols, and then manually clean dangerous (i.e., `javascript:`) protocols. See merge request !1496
| | * | | | | Add custom protocol whitelisting to SanitizationFilterrs-dev-issue-2613Robert Speicher2015-10-012-10/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2613
| * | | | | | Merge branch 'rs-editor-submit' into 'master' Douwe Maan2015-11-022-8/+8
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Persist blob editor's value on submit, not on click Prior, the value of the Ace editor was only being persisted if the user physically clicked the submit button, which the "quick submit" behavior doesn't do. Now the value will be properly transferred before any form is submitted. See merge request !1712
| | * | | | | Persist blob editor's value on submit, not on clickrs-editor-submitRobert Speicher2015-10-312-8/+8
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior, the value of the Ace editor was only being persisted if the user physically clicked the submit button, which the "quick submit" behavior doesn't do. Now the value will be properly transferred before any form is submitted.
* | | | | | Merge pull request #9794 from arnaud-zg/masterRobert Schilling2015-11-021-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Go to gitlab installation folder before initialize database
| * | | | | Go to gitlab installation folder before initialize databasezheng_b2015-11-021-0/+4
| | | | | |
* | | | | | Merge branch 'doc-Gitlab-2-GitLab' into 'master' Achilleas Pipinellis2015-11-017-22/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gilab -> GitLab Replace `Gitlab` with `GitLab` See merge request !1715
| * | | | | | Gilab -> GitLabRobert Schilling2015-10-317-22/+21
| | | | | | |
View Lorry Controller Status