summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 'ph-es-notes-module'ph-es-notes-modulePhil Hughes2017-12-18252-903/+1709
|\
| * Merge branch 'qa/gb/optimize-qa-pipeline' into 'master'Rémy Coutable2017-12-181-0/+21
| |\
| | * Optimize QA pipeline and don't run irrelevant jobsGrzegorz Bizon2017-12-181-0/+21
| |/
| * Merge branch 'ph-even-more-es-modules' into 'master'Filipa Lacerda2017-12-1813-371/+362
| |\
| | * Exported JS classes as modulesph-even-more-es-modulesPhil Hughes2017-12-1513-371/+362
| * | Merge branch 'fix_build_count_in_pipeline_success_maild' into 'master'Grzegorz Bizon2017-12-188-7/+28
| |\ \
| | * | Fix job count in pipeline success mailChristiaan Van den Poel2017-12-188-7/+28
| |/ /
| * | Merge branch 'laravel-with-gitlab-docs' into 'master'Rémy Coutable2017-12-181-1/+1
| |\ \
| | * | With laravel's package auto-discovery, the composer install fails when it tri...Samuel2017-12-151-1/+1
| * | | Merge branch 'patch-25' into 'master'Rémy Coutable2017-12-181-0/+1
| |\ \ \
| | * | | I'm currently the proofreader of Italians Translations, i've started to trans...Paolo Falomo2017-12-131-0/+1
| * | | | Merge branch '39974-toggle-sidebar-btn' into 'master'Phil Hughes2017-12-181-1/+2
| |\ \ \ \
| | * | | | Stop toggle sidebar button from changing height on collapse39974-toggle-sidebar-btnAnnabel Dunstone Gray2017-12-151-1/+2
| * | | | | Merge branch 'skip-sast-on-ce' into 'master'Kamil Trzciński2017-12-161-1/+12
| |\ \ \ \ \
| | * | | | | Avoid running autodevops sast job on GitLab CEskip-sast-on-ceAlessio Caiazza2017-12-151-1/+12
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'qa/rs-filter-by-name-subgroup' into 'master'Grzegorz Bizon2017-12-161-0/+6
| |\ \ \ \ \
| | * | | | | Filter by subgroup name before determining if our group has a subgroupqa/rs-filter-by-name-subgroupRobert Speicher2017-12-151-0/+6
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'qa/rs-screenshot-last-run' into 'master'Grzegorz Bizon2017-12-161-0/+3
| |\ \ \ \ \
| | * | | | | Only keep screenshots from last run for QA specsqa/rs-screenshot-last-runRobert Speicher2017-12-151-0/+3
| | |/ / / /
| * | | | | Merge branch '38019-hide-runner-token' into 'master'Clement Ho2017-12-1510-49/+223
| |\ \ \ \ \
| | * | | | | Hide runner token in CI/CD settings page38019-hide-runner-tokenEric Eastwood2017-12-1510-49/+223
| | | |/ / / | | |/| | |
| * | | | | Update CHANGELOG.md for 10.2.5Michael Kozono2017-12-1512-56/+20
| * | | | | Merge branch 'bump-git-2-14-3' into 'master'Marin Jankovski2017-12-152-2/+2
| |\ \ \ \ \
| | * | | | | Change CI config to use new base imageBalasankar C2017-12-152-2/+2
| |/ / / / /
| * | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |