| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix forks creation when visibility level is restrictedissue_10725 | Felipe Artur | 2016-05-25 | 1 | -0/+7 |
| | | |||||
| * | Merge branch 'incremental-fixes' into 'master' | Jacob Schatz | 2016-05-25 | 1 | -1/+3 |
| |\ | | | | | | | | | | | | | | | | | Fix concurrent request when updating build log in browser If you have a slow internet connection the trace will not be updated correctly. We need to check if our request is the latest one. Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/17535 See merge request !4183 | ||||
| | * | Replace \n to <br> | Kamil Trzcinski | 2016-05-23 | 1 | -1/+3 |
| | | | |||||
| * | | Merge branch 'fix-registry-backups' into 'master' | Douwe Maan | 2016-05-25 | 2 | -9/+26 |
| |\ \ | |/ |/| | | | | | | | | | Fix backups if registry is disabled Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17749 See merge request !4263 | ||||
| | * | Improve after reviewfix-registry-backups | Kamil Trzcinski | 2016-05-24 | 1 | -5/+5 |
| | | | |||||
| | * | Fix backups if registry is disabled | Kamil Trzcinski | 2016-05-23 | 2 | -8/+25 |
| | | | |||||
| * | | Add rubocop-rspecrs-rubocop-rspec | Robert Speicher | 2016-05-23 | 1 | -0/+1 |
| | | | | | | | | | | | Almost all cops are starting as disabled until we can fix their violations. | ||||
| * | | Merge branch 'rs-space-around-keyword' into 'master' | Robert Speicher | 2016-05-23 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | Enable Style/SpaceAroundKeyword cop and fix offenses Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/17478 See merge request !4259 | ||||
| | * | | Enable Style/SpaceAroundKeyword cop and fix offenses | Robert Speicher | 2016-05-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'rs-range-include' into 'master' | Robert Speicher | 2016-05-23 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Enable Performance/RangeInclude cop and fix single offense Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/17478 See merge request !4255 | ||||
| | * | | | Enable Performance/RangeInclude cop and fix single offensers-range-include | Robert Speicher | 2016-05-23 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | Enable Style/DefWithParentheses cop and fix single offense | Robert Speicher | 2016-05-23 | 1 | -1/+1 |
| |/ / | |||||
| * | | Fix Error 500 in CI charts by gracefully handling commits with no durations | Stan Hu | 2016-05-22 | 1 | -1/+2 |
| |/ | | | | Closes #17730 | ||||
| * | Merge branch 'registry_admin_docs' into 'master' | Achilleas Pipinellis | 2016-05-23 | 1 | -0/+53 |
| |\ | | | | | | | | | | | | | Docker container registry configuration docs. Part of gitlab-org/omnibus-gitlab!764 and gitlab-org/gitlab-ce!4040 See merge request !4141 | ||||
| | * | Add note about port needed in NGINX config | Achilleas Pipinellis | 2016-05-22 | 1 | -0/+2 |
| | | | |||||
| | * | Add NGINX config file for Registry | Achilleas Pipinellis | 2016-05-22 | 1 | -0/+51 |
| | | | |||||
| * | | 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 | 5 | -0/+140 |
| |\ | |||||
| | * | Dropdown implementationzj-gitignore-dropdown | Alfredo Sumaran | 2016-05-20 | 1 | -5/+5 |
| | | | |||||
| | * | Update API and fetching task | Zeger-Jan van de Weg | 2016-05-20 | 2 | -38/+46 |
| | | | |||||
| | * | Backend for a gitignores dropdown | Zeger-Jan van de Weg | 2016-05-20 | 5 | -0/+132 |
| | | | |||||
| * | | Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename' | Douwe Maan | 2016-05-20 | 3 | -8/+53 |
| |\ \ | | | | | | | | | | | | | # 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 | 3 | -8/+43 |
| | | | | | | | | | | | | | Gitlab::Diff::InlineDiff | ||||
| * | | | Merge branch 'eReGeBe/gitlab-ce-feature/milestone-md' into 'master' | Douwe Maan | 2016-05-20 | 1 | -1/+43 |
| |\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement special GitLab markdown reference for milestones https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3453 by @eReGeBe, with two additions: - Move changelog item to 8.8 - Fix cross-project milestone ref with invalid project, like https://gitlab.com/gitlab-org/gitlab-ce/commit/f7348cd348ad8f4a18d74dd668283a4e236f5790 did for labels Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13829 See merge request !3897 | ||||
| | * | | Merge remote-tracking branch 'origin/master' into ↵ | Rémy Coutable | 2016-05-18 | 68 | -476/+1200 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | eReGeBe/gitlab-ce-feature/milestone-md Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | Fix cross-project milestone ref with invalid project | Douwe Maan | 2016-04-23 | 1 | -11/+17 |
| | | | | | |||||
| | * | | | Merge branch 'master' into eReGeBe/gitlab-ce-feature/milestone-md | Douwe Maan | 2016-04-23 | 6 | -44/+42 |
| | |\ \ \ | |||||
| | * | | | | Using project `path_with_namespace` in milestone's cross project references ↵ | Alejandro Rodríguez | 2016-04-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | link text | ||||
| | * | | | | Escaping the `object_link_text` on cross project milestone references | Alejandro Rodríguez | 2016-04-20 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Transforming milestones link references to the short reference form | Alejandro Rodríguez | 2016-04-20 | 1 | -0/+5 |
| | | | | | | |||||
| | * | | | | Consistently using iid when treating milestones as referrables | Alejandro Rodríguez | 2016-04-20 | 1 | -5/+14 |
| | | | | | | | | | | | | | | | | | | | | | Also, addint a suffix to the reference text when the milestone is in another project | ||||
| | * | | | | Implementing special GitLab markdown reference for milestones | Alejandro Rodríguez | 2016-04-20 | 1 | -2/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Using the syntax proposed in #13829 [project_reference]%(milestone_id | milestone_name) to get a link to the referred milestone. | ||||
| * | | | | | 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  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 |
| | | | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |