Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '25680-CI_ENVIRONMENT_URL' into 'master' | Kamil Trzciński | 2017-06-05 | 1 | -6/+90 |
|\ | |||||
| * | CreatePipelineBuildsService would have created env | Lin Jen-Shin | 2017-06-02 | 1 | -30/+0 |
| * | Merge remote-tracking branch 'upstream/master' into 25680-CI_ENVIRONMENT_URL | Lin Jen-Shin | 2017-06-02 | 6 | -93/+280 |
| |\ | |||||
| * | | 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 |
| * | | 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 | 1 | -4/+3 |
| * | | Merge remote-tracking branch 'upstream/master' into 25680-CI_ENVIRONMENT_URL | Lin Jen-Shin | 2017-06-01 | 16 | -286/+243 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into '25680-CI_ENVIRONMENT_URL' | Lin Jen-Shin (godfat) | 2017-05-26 | 12 | -139/+277 |
| |\ \ \ | |||||
| * | | | | Pass external_url from environment if job doesn't have one | Lin Jen-Shin | 2017-05-25 | 1 | -10/+32 |
| * | | | | Add tests for CI_ENVIRONMENT_URL | Lin Jen-Shin | 2017-05-25 | 1 | -6/+53 |
* | | | | | Merge branch '33139-lint-our-factories' into 'master' | Grzegorz Bizon | 2017-06-02 | 1 | -4/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Lint our factories creation in addition to their build33139-lint-our-factories | Rémy Coutable | 2017-06-02 | 1 | -4/+6 |
* | | | | | | Merge branch '33215-fix-hard-delete-of-users' into 'master' | Douwe Maan | 2017-06-02 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix hard-deleting users when they have authored issues | Nick Thomas | 2017-06-02 | 1 | -1/+1 |
* | | | | | | | Merge branch '31511-jira-settings' into 'master' | Sean McGivern | 2017-06-02 | 1 | -35/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fix failing specs | Jarka Kadlecova | 2017-06-01 | 1 | -35/+0 |
* | | | | | | | | Merge branch 'zj-realtime-env-list' into 'master' | Kamil Trzciński | 2017-06-01 | 2 | -1/+34 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Explicitly test etag cache invalidationzj-realtime-env-list | Z.J. van de Weg | 2017-06-01 | 1 | -3/+8 |
| * | | | | | | | Merge branch 'master' into zj-realtime-env-list | Z.J. van de Weg | 2017-06-01 | 22 | -374/+481 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| * | | | | | | | Test etag cache key changing value | Z.J. van de Weg | 2017-05-31 | 1 | -0/+12 |
| * | | | | | | | Merge branch 'master' into zj-realtime-env-list | Z.J. van de Weg | 2017-05-25 | 7 | -11/+97 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Test etag caching router and incorporate review | Z.J. van de Weg | 2017-05-24 | 1 | -0/+8 |
| * | | | | | | | | Use etag caching for environments JSON | Z.J. van de Weg | 2017-05-22 | 1 | -1/+9 |
* | | | | | | | | | Merge branch '24196-protected-variables' into 'master' | Kamil Trzciński | 2017-06-01 | 3 | -12/+173 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | 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 | 1 | -2/+24 |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | |||||
| * | | | | | | | | 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 | 3 | -20/+18 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | 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 | 12 | -213/+178 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' into '24196-protected-variables' | Lin Jen-Shin (godfat) | 2017-05-26 | 12 | -139/+277 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge secret and protected vars to variables_for(ref) | Lin Jen-Shin | 2017-05-27 | 3 | -13/+38 |
| * | | | | | | | | | Frontend implementation, tests, and changelog | Lin Jen-Shin | 2017-05-25 | 1 | -2/+2 |
| * | | | | | | | | | Add tests and also pass protected vars to protected tags | Lin Jen-Shin | 2017-05-25 | 2 | -4/+67 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'dm-update-discussion-diff-position' into 'master' | Grzegorz Bizon | 2017-06-01 | 2 | -28/+9 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update diff discussion position per discussion instead of per notedm-update-discussion-diff-position | Douwe Maan | 2017-05-31 | 2 | -28/+9 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | 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 'dm-collapsed-blob' into 'master' | Sean McGivern | 2017-06-01 | 2 | -51/+23 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Fix Diff#too_large? and specs | Douwe Maan | 2017-05-30 | 1 | -32/+4 |
| * | | | | | | | Consistent diff and blob size limit names | Douwe Maan | 2017-05-29 | 2 | -29/+29 |
* | | | | | | | | Merge branch 'master' into 'trigger-source' | Grzegorz Bizon | 2017-05-31 | 3 | -20/+18 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'tc-improve-project-api-perf' into 'master' | Douwe Maan | 2017-05-31 | 2 | -19/+14 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Remove some deprecated methodstc-improve-project-api-perf | Toon Claes | 2017-05-30 | 1 | -19/+0 |
| | * | | | | | | | Add starred_by scope to Project | Toon Claes | 2017-05-30 | 1 | -0/+14 |
| | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | Fix environment model specs related to protected actions | Grzegorz Bizon | 2017-05-31 | 1 | -1/+4 |
| |/ / / / / / | |||||
* | | | | | | | Introduce source to pipeline entitytrigger-source | Kamil Trzcinski | 2017-05-31 | 1 | -2/+24 |
|/ / / / / / |