Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add minor improvements in readability in CI configrefactor/ci-config-move-global-entries | Grzegorz Bizon | 2016-07-04 | 6 | -8/+6 |
* | Extract CI configuration entry node factory method | Grzegorz Bizon | 2016-07-04 | 1 | -8/+12 |
* | Improve description of CI types node and in specs | Grzegorz Bizon | 2016-06-30 | 2 | -3/+3 |
* | Explicitly define entry node class in new CI config | Grzegorz Bizon | 2016-06-29 | 2 | -11/+11 |
* | Add CI config entry validator for allowed keys | Grzegorz Bizon | 2016-06-29 | 4 | -18/+17 |
* | Return compound value if CI config node is composite | Grzegorz Bizon | 2016-06-29 | 1 | -1/+6 |
* | Move global CI cache configuration to new CI classes | Grzegorz Bizon | 2016-06-29 | 2 | -29/+3 |
* | Add global cache config entry to new CI config | Grzegorz Bizon | 2016-06-29 | 16 | -36/+64 |
* | Add CI config entry location info to error message | Grzegorz Bizon | 2016-06-29 | 4 | -14/+15 |
* | Make it possible to set parent in CI config node | Grzegorz Bizon | 2016-06-29 | 3 | -5/+18 |
* | Merge branch 'master' into refactor/ci-config-move-global-entries | Grzegorz Bizon | 2016-06-28 | 552 | -3362/+7573 |
|\ | |||||
| * | Merge branch 'gitlab_architecture' into 'master' | Achilleas Pipinellis | 2016-06-28 | 3 | -1/+3 |
| |\ | |||||
| | * | Add "GitLab team members only" to diagram linkgitlab_architecture | Chris Wilson | 2016-06-28 | 1 | -1/+1 |
| | * | Update GitLab architecture diagram, include Google draw link | Chris Wilson | 2016-06-23 | 2 | -0/+2 |
| | * | Replace GitLab architecture diagram | Achilleas Pipinellis | 2016-04-13 | 3 | -1/+1 |
| * | | Merge branch 'display-deleted-ref-in-events' into 'master' | Rémy Coutable | 2016-06-28 | 3 | -9/+19 |
| |\ \ | |||||
| | * | | Display last commit of deleted branch in push events (!4699) | winniehell | 2016-06-28 | 3 | -9/+19 |
| * | | | Merge branch 'fix/attr-encrypted-issue' into 'master' | Rémy Coutable | 2016-06-28 | 4 | -0/+6 |
| |\ \ \ | |||||
| | * | | | add changelog | James Lopez | 2016-06-28 | 1 | -0/+3 |
| | * | | | add missing attribute to attr_encrypted so it is fully backwards-compatible | James Lopez | 2016-06-28 | 3 | -0/+3 |
| * | | | | Merge branch 'feature/custom-highlighting' into 'master' | Rémy Coutable | 2016-06-28 | 10 | -12/+101 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | doc: note that .gitattributes uses default branchfeature/custom-highlighting | http://jneen.net/ | 2016-06-27 | 1 | -0/+2 |
| | * | | | use the conf lexer so we have highlighted comments | http://jneen.net/ | 2016-06-27 | 1 | -1/+1 |
| | * | | | first draft of docs | http://jneen.net/ | 2016-06-27 | 1 | -0/+29 |
| | * | | | support cgi style options, such as erb?parent=json | http://jneen.net/ | 2016-06-27 | 3 | -7/+18 |
| | * | | | move the path alias to a more appropriate location | http://jneen.net/ | 2016-06-27 | 1 | -5/+5 |
| | * | | | make #custom_language private | http://jneen.net/ | 2016-06-27 | 1 | -8/+8 |
| | * | | | appease rubocop | http://jneen.net/ | 2016-06-27 | 1 | -2/+1 |
| | * | | | add an alias for Snippet#path | http://jneen.net/ | 2016-06-27 | 1 | -0/+6 |
| | * | | | appease rubocop | http://jneen.net/ | 2016-06-27 | 1 | -2/+2 |
| | * | | | check the tag so that an instance will pass too | http://jneen.net/ | 2016-06-27 | 1 | -1/+1 |
| | * | | | fix the spec, using project.change_head | http://jneen.net/ | 2016-06-27 | 2 | -3/+10 |
| | * | | | Revert "bump the master sha for gitlab-test!9" | http://jneen.net/ | 2016-06-27 | 1 | -1/+1 |
| | * | | | bump the master sha for gitlab-test!9 | http://jneen.net/ | 2016-06-27 | 1 | -1/+1 |
| | * | | | add custom highlighting via .gitattributes | http://jneen.net/ | 2016-06-27 | 7 | -12/+47 |
| * | | | | Merge remote-tracking branch 'dev/master' | Robert Speicher | 2016-06-27 | 10 | -9/+154 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Merge branch 'fix-18997' into 'master' | Robert Speicher | 2016-06-27 | 4 | -2/+113 |
| | |\ \ \ | |||||
| | | * | | | Update CHANGELOG | Douglas Barbosa Alexandre | 2016-06-22 | 1 | -0/+3 |
| | | * | | | Fix visibility of private project snippets for members when searching | Douglas Barbosa Alexandre | 2016-06-22 | 3 | -20/+68 |
| | | * | | | Fix internal snippets can be searched by anyone | Douglas Barbosa Alexandre | 2016-06-22 | 3 | -2/+62 |
| | * | | | | Merge branch '19102-fix' into 'master' | Robert Speicher | 2016-06-27 | 6 | -6/+42 |
| | |\ \ \ \ | |||||
| | | * | | | | Fix an information disclosure when requesting access to a group containing pr... | Rémy Coutable | 2016-06-24 | 6 | -6/+42 |
| | | | |/ / | | | |/| | | |||||
| * | | | | | Merge branch 'rename_license_template_api' into 'master' | Robert Speicher | 2016-06-27 | 3 | -4/+4 |
| |\ \ \ \ \ | |||||
| | * | | | | | Rename Licenses API to License Templates API | Drew Blessing | 2016-06-27 | 3 | -4/+4 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'issue_18398' into 'master' | Douwe Maan | 2016-06-27 | 3 | -0/+33 |
| |\ \ \ \ \ | |||||
| | * | | | | | Check for conflict with wiki projects when creating a new project.issue_18398 | Ruben Davila | 2016-06-27 | 3 | -0/+33 |
| * | | | | | | Merge branch 'regex-find-replace-http-matcher' into 'master' | Robert Speicher | 2016-06-27 | 67 | -1015/+1015 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Use HTTP matchers if possible | Z.J. van de Weg | 2016-06-27 | 67 | -1015/+1015 |
| * | | | | | | | Merge branch 'cherry-pick-5734e266' into 'master' | Robert Speicher | 2016-06-27 | 2 | -1/+9 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | Update CHANGELOG | Douwe Maan | 2016-06-27 | 1 | -0/+1 |