summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fix popover font sizeClement Ho2018-05-221-0/+3
* Add focus check for gldropdownClement Ho2018-05-211-1/+1
* Fix gl dropdown specClement Ho2018-05-211-2/+2
* Fix affix using stickyfilljs polyfillClement Ho2018-05-211-8/+3
* Fix feature highlightClement Ho2018-05-212-2/+2
* Merge branch 'master' into bootstrap4Clement Ho2018-05-2154-498/+652
|\
| * Merge branch 'fix/gb/exclude-persisted-variables-from-environment-name' into ...Grzegorz Bizon2018-05-212-1/+7
| |\
| | * Separate persisted and runtime pipeline variablesGrzegorz Bizon2018-05-182-1/+2
| | * Do not allow to use `CI_PIPELINE_ID` in environment nameGrzegorz Bizon2018-05-181-2/+7
| * | Merge branch 'add-broadcast-message-timezone-label' into 'master'Kamil Trzciński2018-05-211-2/+2
| |\ \
| | * | Add timezone information to the date time select labelsAndreas Kämmerle2018-05-161-2/+2
| * | | Merge branch '46082-runner-contacted_at-is-not-always-a-time-type' into 'master'Kamil Trzciński2018-05-214-5/+20
| |\ \ \
| | * | | Revert "Improve cacheable module"46082-runner-contacted_at-is-not-always-a-time-typeMatija Čupić2018-05-181-7/+5
| | * | | Improve cacheable moduleKamil Trzciński2018-05-181-5/+7
| | * | | Include class name and argument name in argument errorMatija Čupić2018-05-171-1/+3
| | * | | Use Gitlab.rails5? for checking if on rails5Matija Čupić2018-05-171-3/+3
| | * | | Revert "Move argument check to cached getter definition class method"Matija Čupić2018-05-161-2/+2
| | * | | Move argument check to cached getter definition class methodMatija Čupić2018-05-161-2/+2
| | * | | Add attribute check in cached getterMatija Čupić2018-05-161-0/+2
| | * | | Move attribute casting to #cached_attributeMatija Čupić2018-05-161-4/+3
| | * | | Dynamically cast value from cacheMatija Čupić2018-05-152-11/+11
| | * | | Clear memoization after caching new valuesMatija Čupić2018-05-111-0/+2
| | * | | Use symbol instead of string in RedisCacheable attribute definitionsMatija Čupić2018-05-101-2/+2
| | * | | Merge branch 'master' into 46082-runner-contacted_at-is-not-always-a-time-typeMatija Čupić2018-05-0924-86/+89
| | |\ \ \
| | * | | | Revert "Partially revert ebcd5711c5ff937bf925002bf9a5b636b037684e to fix runn...Matija Čupić2018-05-092-2/+2
| | * | | | Move Runner#contacted_at to RedisCacheable#cached_attr_time_readerMatija Čupić2018-05-081-1/+2
| | * | | | Add cached_attr_time_reader to RedisCacheableMatija Čupić2018-05-081-0/+9
| * | | | | Merge branch '46454-wrong-value-in-ci-deploy-user' into 'master'Kamil Trzciński2018-05-211-1/+1
| |\ \ \ \ \
| | * | | | | Fixes deploy tokens build variables46454-wrong-value-in-ci-deploy-userMayra Cabrera2018-05-181-1/+1
| * | | | | | Merge branch 'jr-web-ide-shortcuts' into 'master'Tim Zallmann2018-05-211-0/+11
| |\ \ \ \ \ \
| | * | | | | | Add web shortcut to docs and shortcut modaljr-web-ide-shortcutsJames Ramsay2018-05-181-0/+11
| | |/ / / / /
| * | | | | | Merge branch '5845-extract-ee-environments-files' into 'master'Phil Hughes2018-05-213-27/+19
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into 5845-extract-ee-environments-files5845-extract-ee-environments-filesFilipa Lacerda2018-05-1845-456/+611
| | |\ \ \ \ \ \ | | | |/ / / / /
| | * | | | | | Update method nameFilipa Lacerda2018-05-172-4/+4
| | * | | | | | [ci skip] Merge branch 'master' into 5845-extract-ee-environments-filesFilipa Lacerda2018-05-1723-62/+148
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into 5845-extract-ee-environments-filesFilipa Lacerda2018-05-1626-116/+270
| | |\ \ \ \ \ \ \
| | * | | | | | | | Replace vue resource with axios for environmentsFilipa Lacerda2018-05-143-23/+15
| * | | | | | | | | Merge branch '44799-api-naming-issue-scope' into 'master'Rémy Coutable2018-05-213-6/+7
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add created_by_me and assigned_to_me scopes44799-api-naming-issue-scopeMark Chao2018-05-213-6/+7
| * | | | | | | | | | Merge branch '45065-users-projects-json-sort' into 'master'Rémy Coutable2018-05-211-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Order UsersController#projects.json by updated_atTakuya Noguchi2018-05-191-1/+1
| * | | | | | | | | | | Rescue Kubeclient::HttpError when generating prometheus_clientShinya Maeda2018-05-211-0/+5
| * | | | | | | | | | | Merge branch 'docs/fix-chmod' into 'master'Stan Hu2018-05-181-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Chmod 644 on offending filesdocs/fix-chmodAchilleas Pipinellis2018-05-181-0/+0
| | | |_|_|_|/ / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'update-cicd-icon' into 'master'Mike Greiling2018-05-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Update CICD to use rocket iconupdate-cicd-iconJoshua Lambert2018-05-171-1/+1
| * | | | | | | | | | Merge branch 'dz-refactor-lists-css' into 'master'Annabel Gray2018-05-182-228/+228
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Move group lists css from framework/lists.scss to pages/groups.scssdz-refactor-lists-cssDmitriy Zaporozhets2018-05-182-228/+228
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'ide-sidebar-spacing' into 'master'Filipa Lacerda2018-05-184-45/+63
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | fixed up spacing above & below listside-sidebar-spacingPhil Hughes2018-05-171-1/+8
View Lorry Controller Status