summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add minor improvements in readability in CI configrefactor/ci-config-move-global-entriesGrzegorz Bizon2016-07-046-8/+6
* Extract CI configuration entry node factory methodGrzegorz Bizon2016-07-041-8/+12
* Improve description of CI types node and in specsGrzegorz Bizon2016-06-302-3/+3
* Explicitly define entry node class in new CI configGrzegorz Bizon2016-06-292-11/+11
* Add CI config entry validator for allowed keysGrzegorz Bizon2016-06-294-18/+17
* Return compound value if CI config node is compositeGrzegorz Bizon2016-06-291-1/+6
* Move global CI cache configuration to new CI classesGrzegorz Bizon2016-06-292-29/+3
* Add global cache config entry to new CI configGrzegorz Bizon2016-06-2916-36/+64
* Add CI config entry location info to error messageGrzegorz Bizon2016-06-294-14/+15
* Make it possible to set parent in CI config nodeGrzegorz Bizon2016-06-293-5/+18
* Merge branch 'master' into refactor/ci-config-move-global-entriesGrzegorz Bizon2016-06-28552-3362/+7573
|\
| * Merge branch 'gitlab_architecture' into 'master' Achilleas Pipinellis2016-06-283-1/+3
| |\
| | * Add "GitLab team members only" to diagram linkgitlab_architectureChris Wilson2016-06-281-1/+1
| | * Update GitLab architecture diagram, include Google draw linkChris Wilson2016-06-232-0/+2
| | * Replace GitLab architecture diagramAchilleas Pipinellis2016-04-133-1/+1
| * | Merge branch 'display-deleted-ref-in-events' into 'master' Rémy Coutable2016-06-283-9/+19
| |\ \
| | * | Display last commit of deleted branch in push events (!4699)winniehell2016-06-283-9/+19
| * | | Merge branch 'fix/attr-encrypted-issue' into 'master' Rémy Coutable2016-06-284-0/+6
| |\ \ \
| | * | | add changelogJames Lopez2016-06-281-0/+3
| | * | | add missing attribute to attr_encrypted so it is fully backwards-compatibleJames Lopez2016-06-283-0/+3
| * | | | Merge branch 'feature/custom-highlighting' into 'master' Rémy Coutable2016-06-2810-12/+101
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | doc: note that .gitattributes uses default branchfeature/custom-highlightinghttp://jneen.net/2016-06-271-0/+2
| | * | | use the conf lexer so we have highlighted commentshttp://jneen.net/2016-06-271-1/+1
| | * | | first draft of docshttp://jneen.net/2016-06-271-0/+29
| | * | | support cgi style options, such as erb?parent=jsonhttp://jneen.net/2016-06-273-7/+18
| | * | | move the path alias to a more appropriate locationhttp://jneen.net/2016-06-271-5/+5
| | * | | make #custom_language privatehttp://jneen.net/2016-06-271-8/+8
| | * | | appease rubocophttp://jneen.net/2016-06-271-2/+1
| | * | | add an alias for Snippet#pathhttp://jneen.net/2016-06-271-0/+6
| | * | | appease rubocophttp://jneen.net/2016-06-271-2/+2
| | * | | check the tag so that an instance will pass toohttp://jneen.net/2016-06-271-1/+1
| | * | | fix the spec, using project.change_headhttp://jneen.net/2016-06-272-3/+10
| | * | | Revert "bump the master sha for gitlab-test!9"http://jneen.net/2016-06-271-1/+1
| | * | | bump the master sha for gitlab-test!9http://jneen.net/2016-06-271-1/+1
| | * | | add custom highlighting via .gitattributeshttp://jneen.net/2016-06-277-12/+47
| * | | | Merge remote-tracking branch 'dev/master'Robert Speicher2016-06-2710-9/+154
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch 'fix-18997' into 'master' Robert Speicher2016-06-274-2/+113
| | |\ \ \
| | | * | | Update CHANGELOGDouglas Barbosa Alexandre2016-06-221-0/+3
| | | * | | Fix visibility of private project snippets for members when searchingDouglas Barbosa Alexandre2016-06-223-20/+68
| | | * | | Fix internal snippets can be searched by anyoneDouglas Barbosa Alexandre2016-06-223-2/+62
| | * | | | Merge branch '19102-fix' into 'master' Robert Speicher2016-06-276-6/+42
| | |\ \ \ \
| | | * | | | Fix an information disclosure when requesting access to a group containing pr...Rémy Coutable2016-06-246-6/+42
| | | | |/ / | | | |/| |
| * | | | | Merge branch 'rename_license_template_api' into 'master' Robert Speicher2016-06-273-4/+4
| |\ \ \ \ \
| | * | | | | Rename Licenses API to License Templates APIDrew Blessing2016-06-273-4/+4
| |/ / / / /
| * | | | | Merge branch 'issue_18398' into 'master' Douwe Maan2016-06-273-0/+33
| |\ \ \ \ \
| | * | | | | Check for conflict with wiki projects when creating a new project.issue_18398Ruben Davila2016-06-273-0/+33
| * | | | | | Merge branch 'regex-find-replace-http-matcher' into 'master' Robert Speicher2016-06-2767-1015/+1015
| |\ \ \ \ \ \
| | * | | | | | Use HTTP matchers if possibleZ.J. van de Weg2016-06-2767-1015/+1015
| * | | | | | | Merge branch 'cherry-pick-5734e266' into 'master' Robert Speicher2016-06-272-1/+9
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Update CHANGELOGDouwe Maan2016-06-271-0/+1