diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-06-28 14:38:05 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-06-28 14:38:05 +0200 |
| commit | 2846f95d2a6a7418fb655f6588037bd3173fe77f (patch) | |
| tree | 6ee5282cf9851c08c65ce024486782d4b9a3a78c /lib/api/variables.rb | |
| parent | c019585cb83b1852451184663085e6f0e0d12024 (diff) | |
| parent | 365015e3c935afd8e4d3073078712cccd3077204 (diff) | |
| download | gitlab-ce-2846f95d2a6a7418fb655f6588037bd3173fe77f.tar.gz | |
Merge branch 'master' into refactor/ci-config-move-global-entries
* master: (352 commits)
Display last commit of deleted branch in push events (!4699)
add changelog
add missing attribute to attr_encrypted so it is fully backwards-compatible
Add "GitLab team members only" to diagram link
doc: note that .gitattributes uses default branch
use the conf lexer so we have highlighted comments
first draft of docs
support cgi style options, such as erb?parent=json
move the path alias to a more appropriate location
make #custom_language private
appease rubocop
add an alias for Snippet#path
appease rubocop
check the tag so that an instance will pass too
fix the spec, using project.change_head
Revert "bump the master sha for gitlab-test!9"
bump the master sha for gitlab-test!9
add custom highlighting via .gitattributes
Rename Licenses API to License Templates API
Check for conflict with wiki projects when creating a new project.
...
Diffstat (limited to 'lib/api/variables.rb')
0 files changed, 0 insertions, 0 deletions