Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into 25680-CI_ENVIRONMENT_URL | Lin Jen-Shin | 2017-06-02 | 20 | -115/+699 |
|\ | |||||
| * | Merge branch 'dm-gravatar-username' into 'master' | Sean McGivern | 2017-06-01 | 1 | -0/+20 |
| |\ | |||||
| | * | Add username parameter to gravatar URL | Douwe Maan | 2017-06-01 | 1 | -0/+20 |
| * | | Merge branch '24196-protected-variables' into 'master' | Kamil Trzciński | 2017-06-01 | 7 | -18/+237 |
| |\ \ | |||||
| | * | | Make sure protected can't be null; Test protected!24196-protected-variables | Lin Jen-Shin | 2017-06-01 | 1 | -2/+24 |
| | * | | Merge branch 'master' into '24196-protected-variables' | Kamil Trzciński | 2017-06-01 | 18 | -15/+296 |
| | |\ \ | |||||
| | * | | | 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 | 58 | -201/+1691 |
| | |\ \ \ | |||||
| | * | | | | 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 |
| | * | | | | Update docs and use protected secret variable as the name | Lin Jen-Shin | 2017-05-31 | 2 | -8/+23 |
| | * | | | | Merge remote-tracking branch 'upstream/master' into 24196-protected-variables | Lin Jen-Shin | 2017-05-31 | 84 | -610/+1402 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' into '24196-protected-variables' | Lin Jen-Shin (godfat) | 2017-05-26 | 90 | -732/+2480 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Merge secret and protected vars to variables_for(ref) | Lin Jen-Shin | 2017-05-27 | 3 | -13/+38 |
| | * | | | | | | Use be_truthy and add back missing link | Lin Jen-Shin | 2017-05-26 | 1 | -1/+1 |
| | * | | | | | | Fix tests and rubocop offense | Lin Jen-Shin | 2017-05-25 | 2 | -3/+7 |
| | * | | | | | | API and doc for protected variables | Lin Jen-Shin | 2017-05-25 | 1 | -2/+5 |
| | * | | | | | | Frontend implementation, tests, and changelog | Lin Jen-Shin | 2017-05-25 | 3 | -3/+50 |
| | * | | | | | | Add tests and also pass protected vars to protected tags | Lin Jen-Shin | 2017-05-25 | 3 | -4/+71 |
| * | | | | | | | Resolve "Improve Container Registry description" | Achilleas Pipinellis | 2017-06-01 | 1 | -1/+1 |
| * | | | | | | | Merge branch 'dm-comment-on-mr-commit-discussion' into 'master' | Grzegorz Bizon | 2017-06-01 | 1 | -1/+40 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fix replying to a commit discussion displayed in the context of an MR | Douwe Maan | 2017-06-01 | 1 | -1/+40 |
| * | | | | | | | | Merge branch 'migrate-old-artifacts' into 'master' | Grzegorz Bizon | 2017-06-01 | 3 | -0/+211 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Add missing specs | Kamil Trzcinski | 2017-06-01 | 3 | -8/+102 |
| | * | | | | | | | | Fix data inconsistency issue for old artifacts by moving them to a currently ... | Kamil Trzcinski | 2017-06-01 | 1 | -0/+117 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge branch 'dm-update-discussion-diff-position' into 'master' | Grzegorz Bizon | 2017-06-01 | 3 | -42/+23 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Update diff discussion position per discussion instead of per notedm-update-discussion-diff-position | Douwe Maan | 2017-05-31 | 3 | -42/+23 |
| * | | | | | | | | | Merge branch 'bugfix/deploy_keys__can_push__usage_in_api' into 'master' | Rémy Coutable | 2017-06-01 | 1 | -0/+9 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Extend spec tests for deploy_key can_push | Richard Clamp | 2017-05-23 | 1 | -0/+9 |
| * | | | | | | | | | | Merge branch 'document-not-using-serialize' into 'master' | Douwe Maan | 2017-06-01 | 1 | -0/+33 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Added Cop to blacklist the use of serializedocument-not-using-serialize | Yorick Peterse | 2017-05-31 | 1 | -0/+33 |
| | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge branch 'fix-n-plus-one-queries-for-user-access' into 'master' | Yorick Peterse | 2017-06-01 | 1 | -53/+98 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Fix N+1 queries for non-members in comment threadsfix-n-plus-one-queries-for-user-access | Sean McGivern | 2017-06-01 | 1 | -53/+98 |
| | |/ / / / / / / / | |||||
| * | | | | | | | | | Merge branch 'fix_diff_line_comments' into 'master' | Sean McGivern | 2017-06-01 | 1 | -0/+27 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Fix rubocop in spec/helpers/diff_helper_spec.rb | Valery Sizov | 2017-06-01 | 1 | -6/+7 |
| | * | | | | | | | | | Fix: A diff comment on a change at last line of a file shows as two comments ... | Valery Sizov | 2017-05-31 | 1 | -0/+26 |
* | | | | | | | | | | | Fix other use of CreateDeploymentService and make | Lin Jen-Shin | 2017-06-02 | 2 | -7/+35 |
* | | | | | | | | | | | Fix a typo: not -> no | Lin Jen-Shin | 2017-06-01 | 1 | -1/+1 |
* | | | | | | | | | | | Merge all environment url methods, introduce ensure_persisted_environment | Lin Jen-Shin | 2017-06-01 | 1 | -25/+38 |
* | | | | | | | | | | | split tests for expanded_environment_url | Lin Jen-Shin | 2017-06-01 | 1 | -4/+25 |
* | | | | | | | | | | | Simplify CreateDeploymentService so that it uses | Lin Jen-Shin | 2017-06-01 | 1 | -52/+33 |
* | | | | | | | | | | | Introduce ci_environment_url which would fallback | Lin Jen-Shin | 2017-06-01 | 1 | -6/+18 |
* | | | | | | | | | | | Just use the url from options, not saving it as a column | Lin Jen-Shin | 2017-06-01 | 4 | -15/+3 |
* | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 25680-CI_ENVIRONMENT_URL | Lin Jen-Shin | 2017-06-01 | 161 | -924/+3525 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge branch 'notebook-katex-fixes' into 'master' | Filipa Lacerda | 2017-06-01 | 3 | -1/+64 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | added testsnotebook-katex-fixes | Phil Hughes | 2017-05-30 | 3 | -1/+64 |
| * | | | | | | | | | | | Merge branch 'dm-collapsed-blob' into 'master' | Sean McGivern | 2017-06-01 | 7 | -98/+68 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Change no_limits to limitsdm-collapsed-blob | Douwe Maan | 2017-05-31 | 1 | -9/+9 |
| | * | | | | | | | | | | | Fix Diff#too_large? and specs | Douwe Maan | 2017-05-30 | 3 | -50/+20 |
| | * | | | | | | | | | | | Consistent diff and blob size limit names | Douwe Maan | 2017-05-29 | 7 | -61/+61 |