Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Inverse the has_multiple_clusters? helper usagefix-cluster-enviroment-missing | Matija Čupić | 2017-12-18 | 4 | -4/+4 |
* | Hardcode clusters helper in CE | Matija Čupić | 2017-12-18 | 1 | -1/+1 |
* | Use helper for feature check in cluster partials | Matija Čupić | 2017-12-18 | 5 | -2/+15 |
* | Revert save button caption change | Matija Čupić | 2017-12-16 | 1 | -1/+1 |
* | Add environment scope field to cluster forms | Matija Čupić | 2017-12-16 | 4 | -1/+8 |
* | Allow environment_scope in cluster controllers | Matija Čupić | 2017-12-16 | 3 | -0/+4 |
* | Merge branch 'qa/rs-filter-by-name-subgroup' into 'master' | Grzegorz Bizon | 2017-12-16 | 1 | -0/+6 |
|\ | |||||
| * | Filter by subgroup name before determining if our group has a subgroupqa/rs-filter-by-name-subgroup | Robert Speicher | 2017-12-15 | 1 | -0/+6 |
* | | Merge branch 'qa/rs-screenshot-last-run' into 'master' | Grzegorz Bizon | 2017-12-16 | 1 | -0/+3 |
|\ \ | |||||
| * | | Only keep screenshots from last run for QA specsqa/rs-screenshot-last-run | Robert Speicher | 2017-12-15 | 1 | -0/+3 |
| |/ | |||||
* | | Merge branch '38019-hide-runner-token' into 'master' | Clement Ho | 2017-12-15 | 10 | -49/+223 |
|\ \ | |||||
| * | | Hide runner token in CI/CD settings page38019-hide-runner-token | Eric Eastwood | 2017-12-15 | 10 | -49/+223 |
* | | | Update CHANGELOG.md for 10.2.5 | Michael Kozono | 2017-12-15 | 12 | -56/+20 |
* | | | Merge branch 'bump-git-2-14-3' into 'master' | Marin Jankovski | 2017-12-15 | 2 | -2/+2 |
|\ \ \ | |||||
| * | | | Change CI config to use new base image | Balasankar C | 2017-12-15 | 2 | -2/+2 |
|/ / / | |||||
* | | | Merge branch 'no-ivar-in-modules' into 'master' | Robert Speicher | 2017-12-15 | 71 | -188/+766 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Backport changes from EE | Lin Jen-Shin | 2017-12-15 | 3 | -4/+4 |
| * | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules | Lin Jen-Shin | 2017-12-15 | 1285 | -11368/+25617 |
| |\ \ | |||||
| * \ \ | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules | Lin Jen-Shin | 2017-11-30 | 549 | -4330/+10372 |
| |\ \ \ | |||||
| * | | | | Cache allowed_ids | Lin Jen-Shin | 2017-11-22 | 1 | -1/+1 |
| * | | | | Fix a few layout error | Lin Jen-Shin | 2017-11-22 | 3 | -2/+2 |
| * | | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules | Lin Jen-Shin | 2017-11-22 | 533 | -2413/+4542 |
| |\ \ \ \ | |||||
| * | | | | | Make it clear that this is an acceptable use | Lin Jen-Shin | 2017-11-22 | 1 | -5/+8 |
| * | | | | | Reword Instance variables in views | Lin Jen-Shin | 2017-11-22 | 1 | -8/+5 |
| * | | | | | Move ModuleWithInstanceVariables to Gitlab namespace | Lin Jen-Shin | 2017-11-22 | 43 | -240/+198 |
| * | | | | | Explain how to disable it in the doc | Lin Jen-Shin | 2017-11-22 | 2 | -3/+29 |
| * | | | | | Just define allowed_ids and override it with empty value | Lin Jen-Shin | 2017-11-22 | 7 | -16/+10 |
| * | | | | | Updates based on feedback | Lin Jen-Shin | 2017-11-22 | 7 | -121/+108 |
| * | | | | | Remove codes from bad merge | Lin Jen-Shin | 2017-11-18 | 1 | -2/+0 |
| * | | | | | Allow initialize method and single ivar | Lin Jen-Shin | 2017-11-18 | 2 | -3/+46 |
| * | | | | | Use StrongMemoize and enable/disable cops properly | Lin Jen-Shin | 2017-11-18 | 48 | -169/+193 |
| * | | | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules | Lin Jen-Shin | 2017-11-17 | 1064 | -8722/+28956 |
| |\ \ \ \ \ | |||||
| * | | | | | | WIP | Lin Jen-Shin | 2017-11-06 | 9 | -29/+28 |
| * | | | | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules | Lin Jen-Shin | 2017-11-06 | 2924 | -32659/+79732 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules | Lin Jen-Shin | 2017-09-25 | 633 | -5098/+11440 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix grammar: judge -> judgement | Lin Jen-Shin | 2017-09-19 | 1 | -2/+2 |
| * | | | | | | | | Allow simple ivar ||= form. Update accordingly | Lin Jen-Shin | 2017-09-19 | 53 | -109/+220 |
| * | | | | | | | | Add cop to make sure we don't use ivar in a module | Lin Jen-Shin | 2017-09-18 | 81 | -34/+475 |
* | | | | | | | | | Merge branch 'master' into 'master' | Rémy Coutable | 2017-12-15 | 2 | -1/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fix issue #39843 Incorrect guidance stating blocked users will be removed fro... | Cesar Apodaca | 2017-12-15 | 2 | -1/+6 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch '38239-update-toggle-design' into 'master' | Filipa Lacerda | 2017-12-15 | 6 | -51/+81 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Add changelog entry38239-update-toggle-design | Kushal Pandya | 2017-12-15 | 1 | -0/+5 |
| * | | | | | | | | Update tests for toggle design change | Kushal Pandya | 2017-12-15 | 1 | -3/+11 |
| * | | | | | | | | Update toggle styles to use icons | Kushal Pandya | 2017-12-15 | 1 | -30/+34 |
| * | | | | | | | | Use icons instead of string labels for toggles | Kushal Pandya | 2017-12-15 | 3 | -18/+31 |
* | | | | | | | | | Merge branch 'rc/use-factory_bot_rails' into 'master' | Robert Speicher | 2017-12-15 | 125 | -175/+175 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Replace factory_girl_rails with factory_bot_railsrc/use-factory_bot_rails | Rémy Coutable | 2017-12-14 | 125 | -175/+175 |
* | | | | | | | | | | Merge branch 'ph-more-es-modules' into 'master' | Filipa Lacerda | 2017-12-15 | 13 | -503/+466 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Export JS classes as modulesph-more-es-modules | Phil Hughes | 2017-12-15 | 13 | -503/+466 |
* | | | | | | | | | | | Merge branch 'ignore-markdown-cache-when-stubbing-application-settings' into ... | Nick Thomas | 2017-12-15 | 2 | -4/+7 |
|\ \ \ \ \ \ \ \ \ \ \ |