summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'no-ivar-in-modules' into 'master'Robert Speicher2017-12-1571-188/+766
|\
| * Backport changes from EELin Jen-Shin2017-12-153-4/+4
| * Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-12-151285-11368/+25617
| |\
| * \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-30549-4330/+10372
| |\ \
| * | | Cache allowed_idsLin Jen-Shin2017-11-221-1/+1
| * | | Fix a few layout errorLin Jen-Shin2017-11-223-2/+2
| * | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-22533-2413/+4542
| |\ \ \
| * | | | Make it clear that this is an acceptable useLin Jen-Shin2017-11-221-5/+8
| * | | | Reword Instance variables in viewsLin Jen-Shin2017-11-221-8/+5
| * | | | Move ModuleWithInstanceVariables to Gitlab namespaceLin Jen-Shin2017-11-2243-240/+198
| * | | | Explain how to disable it in the docLin Jen-Shin2017-11-222-3/+29
| * | | | Just define allowed_ids and override it with empty valueLin Jen-Shin2017-11-227-16/+10
| * | | | Updates based on feedbackLin Jen-Shin2017-11-227-121/+108
| * | | | Remove codes from bad mergeLin Jen-Shin2017-11-181-2/+0
| * | | | Allow initialize method and single ivarLin Jen-Shin2017-11-182-3/+46
| * | | | Use StrongMemoize and enable/disable cops properlyLin Jen-Shin2017-11-1848-169/+193
| * | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-171064-8722/+28956
| |\ \ \ \
| * | | | | WIPLin Jen-Shin2017-11-069-29/+28
| * | | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-062924-32659/+79732
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-09-25633-5098/+11440
| |\ \ \ \ \ \
| * | | | | | | Fix grammar: judge -> judgementLin Jen-Shin2017-09-191-2/+2
| * | | | | | | Allow simple ivar ||= form. Update accordinglyLin Jen-Shin2017-09-1953-109/+220
| * | | | | | | Add cop to make sure we don't use ivar in a moduleLin Jen-Shin2017-09-1881-34/+475
* | | | | | | | Merge branch 'master' into 'master'Rémy Coutable2017-12-152-1/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | fix issue #39843 Incorrect guidance stating blocked users will be removed fro...Cesar Apodaca2017-12-152-1/+6
|/ / / / / / / /
* | | | | | | | Merge branch '38239-update-toggle-design' into 'master'Filipa Lacerda2017-12-156-51/+81
|\ \ \ \ \ \ \ \
| * | | | | | | | Add changelog entry38239-update-toggle-designKushal Pandya2017-12-151-0/+5
| * | | | | | | | Update tests for toggle design changeKushal Pandya2017-12-151-3/+11
| * | | | | | | | Update toggle styles to use iconsKushal Pandya2017-12-151-30/+34
| * | | | | | | | Use icons instead of string labels for togglesKushal Pandya2017-12-153-18/+31
* | | | | | | | | Merge branch 'rc/use-factory_bot_rails' into 'master'Robert Speicher2017-12-15125-175/+175
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Replace factory_girl_rails with factory_bot_railsrc/use-factory_bot_railsRémy Coutable2017-12-14125-175/+175
* | | | | | | | | | Merge branch 'ph-more-es-modules' into 'master'Filipa Lacerda2017-12-1513-503/+466
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Export JS classes as modulesph-more-es-modulesPhil Hughes2017-12-1513-503/+466
* | | | | | | | | | | Merge branch 'ignore-markdown-cache-when-stubbing-application-settings' into ...Nick Thomas2017-12-152-4/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Don't use Markdown cache for stubbed settings in specsignore-markdown-cache-when-stubbing-application-settingsSean McGivern2017-12-152-4/+7
* | | | | | | | | | | | Merge branch '41073-fix-help-links' into 'master'Rémy Coutable2017-12-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | make link open in new tab41073-fix-help-linksBrett Walker2017-12-131-1/+1
* | | | | | | | | | | | | Fix Rubocop offense in QA project specsGrzegorz Bizon2017-12-151-1/+1
* | | | | | | | | | | | | Merge branch 'qa/gb/gitlab-qa-factories' into 'master'Grzegorz Bizon2017-12-1515-197/+199
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix remaining calls to GitLab QA factoriesqa/gb/gitlab-qa-factoriesGrzegorz Bizon2017-12-154-6/+4
| * | | | | | | | | | | | | Rename QA scenarios to make factory concept explicitGrzegorz Bizon2017-12-1512-191/+195
* | | | | | | | | | | | | | Merge branch 'docs/sast' into 'master'Dmitriy Zaporozhets2017-12-151-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add SAST docsAchilleas Pipinellis2017-12-151-0/+14
* | | | | | | | | | | | | | | Merge branch 'dm-ldap-email-readonly' into 'master'Sean McGivern2017-12-1511-45/+108
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Make sure user email is read only when synced with LDAPDouwe Maan2017-12-1511-45/+108
* | | | | | | | | | | | | | | | Merge branch '38145_ux_issues_in_system_info_page' into 'master'Sean McGivern2017-12-153-9/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix UX issues in system info pageGilbert Roulot2017-12-153-9/+14
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch '41014-bump-svg-version' into 'master'Phil Hughes2017-12-152-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Update svg package versionFilipa Lacerda2017-12-152-4/+4
|/ / / / / / / / / / / / / / / /
View Lorry Controller Status