summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add new Rake task to simplify the compilation of PO filesadd-new-rake-task-for-gettextRuben Davila2017-06-012-2/+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
| * | | | | | | Backend implementation for protected variablesLin Jen-Shin2017-05-254-4/+33
* | | | | | | | Merge branch '30651-improve-container-registry-description' into 'master'Kamil Trzciński2017-06-015-22/+58
|\ \ \ \ \ \ \ \
| * | | | | | | | Resolve "Improve Container Registry description"Achilleas Pipinellis2017-06-015-22/+58
|/ / / / / / / /
* | | | | | | | Merge branch 'dm-comment-on-mr-commit-discussion' into 'master'Grzegorz Bizon2017-06-014-2/+51
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix replying to a commit discussion displayed in the context of an MRDouwe Maan2017-06-014-2/+51
* | | | | | | | | Merge branch 'dm-fix-jump-button' into 'master'Fatih Acet2017-06-013-2/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix title of discussion jump button at top of pagedm-fix-jump-buttonDouwe Maan2017-05-263-2/+13
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'migrate-old-artifacts' into 'master'Grzegorz Bizon2017-06-0114-81/+323
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add missing specsKamil Trzcinski2017-06-0114-57/+132
| * | | | | | | | | Fix data inconsistency issue for old artifacts by moving them to a currently ...Kamil Trzcinski2017-06-0114-58/+225
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '31644-make-cookie-sessions-unique' into 'master'Douwe Maan2017-06-012-1/+11
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Update session cookie key name to be unique to instance in development31644-make-cookie-sessions-uniqueEric Eastwood2017-06-012-1/+11
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'dm-update-discussion-diff-position' into 'master'Grzegorz Bizon2017-06-018-93/+87
|\ \ \ \ \ \ \ \
| * | | | | | | | Update diff discussion position per discussion instead of per notedm-update-discussion-diff-positionDouwe Maan2017-05-318-93/+87
* | | | | | | | | Merge branch 'bugfix/deploy_keys__can_push__usage_in_api' into 'master'Rémy Coutable2017-06-013-0/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Extend spec tests for deploy_key can_pushRichard Clamp2017-05-231-0/+9
| * | | | | | | | | Add changelog entryRichard Clamp2017-05-221-0/+4
| * | | | | | | | | Add missing `can_push` parameter to POST /v3/deploy_keysRichard Clamp2017-05-221-0/+1
* | | | | | | | | | Merge branch 'document-not-using-serialize' into 'master'Douwe Maan2017-06-0120-27/+170
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Added Cop to blacklist the use of serializedocument-not-using-serializeYorick Peterse2017-05-3118-27/+85
| * | | | | | | | | Document not storing serialized dataYorick Peterse2017-05-312-0/+85
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix-n-plus-one-queries-for-user-access' into 'master'Yorick Peterse2017-06-013-54/+110
|\ \ \ \ \ \ \ \ \