Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add new Rake task to simplify the compilation of PO filesadd-new-rake-task-for-gettext | Ruben Davila | 2017-06-01 | 2 | -2/+9 |
* | Merge branch '32985-show-more-notes-info-at-smaller-breakpoints' into 'master' | Annabel Dunstone Gray | 2017-06-01 | 1 | -2/+2 |
|\ | |||||
| * | Maintain notes avatar at smaller breakpoint32985-show-more-notes-info-at-smaller-breakpoints | Eric Eastwood | 2017-06-01 | 1 | -2/+2 |
* | | Merge branch 'yuanfeiz/gitlab-ce-aliyun-backup-provider' into 'master' | Rémy Coutable | 2017-06-01 | 4 | -1/+12 |
|\ \ | |||||
| * | | Add fog-aliyun as backup storage provideryuanfeiz/gitlab-ce-aliyun-backup-provider | Yuanfei Zhu | 2017-06-01 | 4 | -1/+12 |
* | | | Merge branch 'dm-gravatar-username' into 'master' | Sean McGivern | 2017-06-01 | 6 | -12/+41 |
|\ \ \ | |||||
| * | | | Add username parameter to gravatar URL | Douwe Maan | 2017-06-01 | 6 | -12/+41 |
* | | | | Merge branch '24196-protected-variables' into 'master' | Kamil Trzciński | 2017-06-01 | 23 | -43/+342 |
|\ \ \ \ | |||||
| * | | | | Make sure protected can't be null; Test protected!24196-protected-variables | Lin Jen-Shin | 2017-06-01 | 2 | -4/+26 |
| * | | | | Just mention which GitLab version is required | Lin Jen-Shin | 2017-06-01 | 1 | -1/+1 |
| * | | | | Merge two items into one in the doc | Lin Jen-Shin | 2017-06-01 | 1 | -2/+1 |
| * | | | | Merge branch 'master' into '24196-protected-variables' | Kamil Trzciński | 2017-06-01 | 50 | -57/+647 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Add test for Project#protected_for? | Lin Jen-Shin | 2017-06-01 | 1 | -0/+37 |
| * | | | | Merge remote-tracking branch 'upstream/master' into 24196-protected-variables | Lin Jen-Shin | 2017-06-01 | 176 | -831/+3766 |
| |\ \ \ \ | |||||
| * | | | | | Make sure we're loading the fresh variables | Lin Jen-Shin | 2017-06-01 | 1 | -4/+4 |
| * | | | | | Now secret_variables_for would return the variables | Lin Jen-Shin | 2017-06-01 | 1 | -3/+2 |
| * | | | | | Fix doc table of contents | Lin Jen-Shin | 2017-05-31 | 1 | -1/+1 |
| * | | | | | Update docs and use protected secret variable as the name | Lin Jen-Shin | 2017-05-31 | 9 | -29/+48 |
| * | | | | | Merge remote-tracking branch 'upstream/master' into 24196-protected-variables | Lin Jen-Shin | 2017-05-31 | 250 | -1676/+3740 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into '24196-protected-variables' | Lin Jen-Shin (godfat) | 2017-05-26 | 296 | -2033/+4904 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Rubocop makes more sense with this | Lin Jen-Shin | 2017-05-27 | 1 | -6/+7 |
| * | | | | | | | Merge secret and protected vars to variables_for(ref) | Lin Jen-Shin | 2017-05-27 | 6 | -32/+51 |
| * | | | | | | | Use be_truthy and add back missing link | Lin Jen-Shin | 2017-05-26 | 2 | -1/+2 |
| * | | | | | | | Fix tests and rubocop offense | Lin Jen-Shin | 2017-05-25 | 3 | -4/+8 |
| * | | | | | | | Add docs for protected variables | Lin Jen-Shin | 2017-05-25 | 2 | -4/+21 |
| * | | | | | | | API and doc for protected variables | Lin Jen-Shin | 2017-05-25 | 4 | -15/+25 |
| * | | | | | | | Frontend implementation, tests, and changelog | Lin Jen-Shin | 2017-05-25 | 9 | -5/+78 |
| * | | | | | | | Add tests and also pass protected vars to protected tags | Lin Jen-Shin | 2017-05-25 | 4 | -5/+74 |
| * | | | | | | | Backend implementation for protected variables | Lin Jen-Shin | 2017-05-25 | 4 | -4/+33 |
* | | | | | | | | Merge branch '30651-improve-container-registry-description' into 'master' | Kamil Trzciński | 2017-06-01 | 5 | -22/+58 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Resolve "Improve Container Registry description" | Achilleas Pipinellis | 2017-06-01 | 5 | -22/+58 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'dm-comment-on-mr-commit-discussion' into 'master' | Grzegorz Bizon | 2017-06-01 | 4 | -2/+51 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix replying to a commit discussion displayed in the context of an MR | Douwe Maan | 2017-06-01 | 4 | -2/+51 |
* | | | | | | | | | Merge branch 'dm-fix-jump-button' into 'master' | Fatih Acet | 2017-06-01 | 3 | -2/+13 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix title of discussion jump button at top of pagedm-fix-jump-button | Douwe Maan | 2017-05-26 | 3 | -2/+13 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'migrate-old-artifacts' into 'master' | Grzegorz Bizon | 2017-06-01 | 14 | -81/+323 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add missing specs | Kamil Trzcinski | 2017-06-01 | 14 | -57/+132 |
| * | | | | | | | | | Fix data inconsistency issue for old artifacts by moving them to a currently ... | Kamil Trzcinski | 2017-06-01 | 14 | -58/+225 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch '31644-make-cookie-sessions-unique' into 'master' | Douwe Maan | 2017-06-01 | 2 | -1/+11 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Update session cookie key name to be unique to instance in development31644-make-cookie-sessions-unique | Eric Eastwood | 2017-06-01 | 2 | -1/+11 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'dm-update-discussion-diff-position' into 'master' | Grzegorz Bizon | 2017-06-01 | 8 | -93/+87 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Update diff discussion position per discussion instead of per notedm-update-discussion-diff-position | Douwe Maan | 2017-05-31 | 8 | -93/+87 |
* | | | | | | | | | Merge branch 'bugfix/deploy_keys__can_push__usage_in_api' into 'master' | Rémy Coutable | 2017-06-01 | 3 | -0/+14 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Extend spec tests for deploy_key can_push | Richard Clamp | 2017-05-23 | 1 | -0/+9 |
| * | | | | | | | | | Add changelog entry | Richard Clamp | 2017-05-22 | 1 | -0/+4 |
| * | | | | | | | | | Add missing `can_push` parameter to POST /v3/deploy_keys | Richard Clamp | 2017-05-22 | 1 | -0/+1 |
* | | | | | | | | | | Merge branch 'document-not-using-serialize' into 'master' | Douwe Maan | 2017-06-01 | 20 | -27/+170 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Added Cop to blacklist the use of serializedocument-not-using-serialize | Yorick Peterse | 2017-05-31 | 18 | -27/+85 |
| * | | | | | | | | | Document not storing serialized data | Yorick Peterse | 2017-05-31 | 2 | -0/+85 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'fix-n-plus-one-queries-for-user-access' into 'master' | Yorick Peterse | 2017-06-01 | 3 | -54/+110 |
|\ \ \ \ \ \ \ \ \ |