summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix missing optional path parameter in "Create project for user" API33242-create-project-for-user-api-ignores-path-parameterAthar Hameed2017-06-023-5/+26
* Merge branch 'add-new-rake-task-for-gettext' into 'master'Douwe Maan2017-06-012-2/+9
|\
| * Add new Rake task to simplify the compilation of PO filesadd-new-rake-task-for-gettextRuben Davila2017-06-012-2/+9
* | Merge branch 'bvl-move-gitlab-git-encodinghelper' into 'master'Robert Speicher2017-06-0112-75/+73
|\ \
| * | Rename `Gitlab::Git::EncodingHelper` to `Gitlab::EncodingHelper`Bob Van Landuyt2017-06-0112-75/+73
|/ /
* | Merge branch 'zj-realtime-env-list' into 'master'Kamil Trzciński2017-06-0115-57/+259
|\ \
| * | Explicitly test etag cache invalidationzj-realtime-env-listZ.J. van de Weg2017-06-011-3/+8
| * | Merge branch 'master' into zj-realtime-env-listZ.J. van de Weg2017-06-01657-4449/+12690
| |\ \
| * | | Test etag cache key changing valueZ.J. van de Weg2017-05-312-2/+19
| * | | Merge branch 'master' into zj-realtime-env-listZ.J. van de Weg2017-05-25347-1874/+3466
| |\ \ \
| * | | | Restore original comment [ci skip]Z.J. van de Weg2017-05-241-1/+1
| * | | | Test etag caching router and incorporate reviewZ.J. van de Weg2017-05-245-6/+25
| * | | | emptyZ.J. van de Weg2017-05-220-0/+0
| * | | | Remove commented codeZ.J. van de Weg2017-05-220-0/+0
| |\ \ \ \
| | * | | | Guarantees first request is made even when the tab is not visibleFilipa Lacerda2017-05-182-0/+4
| | * | | | Creates mixin to hold data common to both environments appsFilipa Lacerda2017-05-153-24/+30
| | * | | | Remove commented codeFilipa Lacerda2017-05-142-3/+0
| | * | | | Adds polling function to environments tableFilipa Lacerda2017-05-148-53/+174
| | * | | | Use etag caching for environments JSONZ.J. van de Weg2017-05-124-1/+40
| * | | | | Adds polling function to environments tableFilipa Lacerda2017-05-226-55/+175
| * | | | | Use etag caching for environments JSONZ.J. van de Weg2017-05-226-3/+43
* | | | | | Merge branch 'dm-fix-pipeline-creation-race-condition' into 'master'Kamil Trzciński2017-06-013-14/+9
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix race condition between pipeline creation and MR diff_head_sha updateDouwe Maan2017-06-013-14/+9
* | | | | | Merge branch '32985-show-more-notes-info-at-smaller-breakpoints' into 'master'Annabel Dunstone Gray2017-06-011-2/+2
|\ \ \ \ \ \
| * | | | | | Maintain notes avatar at smaller breakpoint32985-show-more-notes-info-at-smaller-breakpointsEric Eastwood2017-06-011-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'yuanfeiz/gitlab-ce-aliyun-backup-provider' into 'master'Rémy Coutable2017-06-014-1/+12
|\ \ \ \ \ \
| * | | | | | Add fog-aliyun as backup storage provideryuanfeiz/gitlab-ce-aliyun-backup-providerYuanfei Zhu2017-06-014-1/+12
* | | | | | | Merge branch 'dm-gravatar-username' into 'master'Sean McGivern2017-06-016-12/+41
|\ \ \ \ \ \ \
| * | | | | | | Add username parameter to gravatar URLDouwe Maan2017-06-016-12/+41
* | | | | | | | Merge branch '24196-protected-variables' into 'master'Kamil Trzciński2017-06-0123-43/+342
|\ \ \ \ \ \ \ \
| * | | | | | | | Make sure protected can't be null; Test protected!24196-protected-variablesLin Jen-Shin2017-06-012-4/+26
| * | | | | | | | Just mention which GitLab version is requiredLin Jen-Shin2017-06-011-1/+1
| * | | | | | | | Merge two items into one in the docLin Jen-Shin2017-06-011-2/+1
| * | | | | | | | Merge branch 'master' into '24196-protected-variables'Kamil Trzciński2017-06-0150-57/+647
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Add test for Project#protected_for?Lin Jen-Shin2017-06-011-0/+37
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into 24196-protected-variablesLin Jen-Shin2017-06-01176-831/+3766
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Make sure we're loading the fresh variablesLin Jen-Shin2017-06-011-4/+4
| * | | | | | | | | Now secret_variables_for would return the variablesLin Jen-Shin2017-06-011-3/+2
| * | | | | | | | | Fix doc table of contentsLin Jen-Shin2017-05-311-1/+1
| * | | | | | | | | Update docs and use protected secret variable as the nameLin Jen-Shin2017-05-319-29/+48
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into 24196-protected-variablesLin Jen-Shin2017-05-31250-1676/+3740
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into '24196-protected-variables'Lin Jen-Shin (godfat)2017-05-26296-2033/+4904
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Rubocop makes more sense with thisLin Jen-Shin2017-05-271-6/+7
| * | | | | | | | | | | Merge secret and protected vars to variables_for(ref)Lin Jen-Shin2017-05-276-32/+51
| * | | | | | | | | | | Use be_truthy and add back missing linkLin Jen-Shin2017-05-262-1/+2
| * | | | | | | | | | | Fix tests and rubocop offenseLin Jen-Shin2017-05-253-4/+8
| * | | | | | | | | | | Add docs for protected variablesLin Jen-Shin2017-05-252-4/+21
| * | | | | | | | | | | API and doc for protected variablesLin Jen-Shin2017-05-254-15/+25
| * | | | | | | | | | | Frontend implementation, tests, and changelogLin Jen-Shin2017-05-259-5/+78
| * | | | | | | | | | | Add tests and also pass protected vars to protected tagsLin Jen-Shin2017-05-254-5/+74