summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | Merge branch 'master' into zj-realtime-env-listZ.J. van de Weg2017-06-01258-1765/+3594
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Test etag cache key changing valueZ.J. van de Weg2017-05-311-2/+7
| * | | | | | Merge branch 'master' into zj-realtime-env-listZ.J. van de Weg2017-05-2586-500/+558
| |\ \ \ \ \ \
| * | | | | | | Test etag caching router and incorporate reviewZ.J. van de Weg2017-05-242-1/+6
| * | | | | | | Adds polling function to environments tableFilipa Lacerda2017-05-225-55/+166
| * | | | | | | Use etag caching for environments JSONZ.J. van de Weg2017-05-222-0/+13
* | | | | | | | Merge branch 'dm-fix-pipeline-creation-race-condition' into 'master'Kamil Trzciński2017-06-012-12/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix race condition between pipeline creation and MR diff_head_sha updateDouwe Maan2017-06-012-12/+6
* | | | | | | | | 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 'dm-gravatar-username' into 'master'Sean McGivern2017-06-012-9/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add username parameter to gravatar URLDouwe Maan2017-06-012-9/+14
* | | | | | | | | | Merge branch '24196-protected-variables' into 'master'Kamil Trzciński2017-06-018-8/+34
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into '24196-protected-variables'Kamil Trzciński2017-06-019-16/+19
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 24196-protected-variablesLin Jen-Shin2017-06-0177-286/+1435
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update docs and use protected secret variable as the nameLin Jen-Shin2017-05-315-13/+16
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 24196-protected-variablesLin Jen-Shin2017-05-3193-970/+1104
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into '24196-protected-variables'Lin Jen-Shin (godfat)2017-05-26115-547/+1119
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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-273-19/+13
| * | | | | | | | | | | | Fix tests and rubocop offenseLin Jen-Shin2017-05-251-1/+1
| * | | | | | | | | | | | Add docs for protected variablesLin Jen-Shin2017-05-251-1/+1
| * | | | | | | | | | | | Frontend implementation, tests, and changelogLin Jen-Shin2017-05-254-2/+15
| * | | | | | | | | | | | Add tests and also pass protected vars to protected tagsLin Jen-Shin2017-05-251-1/+3
| * | | | | | | | | | | | Backend implementation for protected variablesLin Jen-Shin2017-05-252-3/+16
* | | | | | | | | | | | | Resolve "Improve Container Registry description"Achilleas Pipinellis2017-06-011-19/+53
| |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'dm-comment-on-mr-commit-discussion' into 'master'Grzegorz Bizon2017-06-012-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix replying to a commit discussion displayed in the context of an MRDouwe Maan2017-06-012-1/+7
* | | | | | | | | | | | | Merge branch 'dm-fix-jump-button' into 'master'Fatih Acet2017-06-012-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix title of discussion jump button at top of pagedm-fix-jump-buttonDouwe Maan2017-05-262-2/+9
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'migrate-old-artifacts' into 'master'Grzegorz Bizon2017-06-013-46/+20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add missing specsKamil Trzcinski2017-06-015-10/+10
| * | | | | | | | | | | | Fix data inconsistency issue for old artifacts by moving them to a currently ...Kamil Trzcinski2017-06-016-53/+27
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'dm-update-discussion-diff-position' into 'master'Grzegorz Bizon2017-06-015-51/+64
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Update diff discussion position per discussion instead of per notedm-update-discussion-diff-positionDouwe Maan2017-05-315-51/+64
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'document-not-using-serialize' into 'master'Douwe Maan2017-06-0115-27/+27
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Added Cop to blacklist the use of serializedocument-not-using-serializeYorick Peterse2017-05-3115-27/+27
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'fix-n-plus-one-queries-for-user-access' into 'master'Yorick Peterse2017-06-011-1/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix N+1 queries for non-members in comment threadsfix-n-plus-one-queries-for-user-accessSean McGivern2017-06-011-1/+8
| |/ / / / / / / / /
* | | | | | | | | | Merge branch '31602-display-whether-shared-runner-is-enabled-in-the-admin-das...Rémy Coutable2017-06-011-0/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Display Shared Runner status in Admin Dashboardvanadium232017-05-311-0/+6
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fix_diff_line_comments' into 'master'Sean McGivern2017-06-012-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix: A diff comment on a change at last line of a file shows as two comments ...Valery Sizov2017-05-312-3/+3
* | | | | | | | | | | Merge branch 'notebook-katex-fixes' into 'master'Filipa Lacerda2017-06-011-7/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fixed inline mathPhil Hughes2017-05-301-1/+2
| * | | | | | | | | | | fixed spacing before inline mathPhil Hughes2017-05-301-1/+2
| * | | | | | | | | | | fixed spacing because of removed &Phil Hughes2017-05-301-1/+2
| * | | | | | | | | | | fixed & being renderedPhil Hughes2017-05-301-3/+2
| * | | | | | | | | | | Fixes multi-line math in notebooksPhil Hughes2017-05-301-7/+15
* | | | | | | | | | | | Merge branch 'dm-collapsed-blob' into 'master'Sean McGivern2017-06-0116-56/+42
|\ \ \ \ \ \ \ \ \ \ \ \