summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ph-even-more-es-modules' into 'master'Filipa Lacerda2017-12-189-363/+358
|\
| * Exported JS classes as modulesph-even-more-es-modulesPhil Hughes2017-12-159-363/+358
* | Fix job count in pipeline success mailChristiaan Van den Poel2017-12-185-5/+9
* | 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 '38019-hide-runner-token' into 'master'Clement Ho2017-12-156-46/+69
|\ \ \
| * | | Hide runner token in CI/CD settings page38019-hide-runner-tokenEric Eastwood2017-12-156-46/+69
| | |/ | |/|
* | | Merge branch 'no-ivar-in-modules' into 'master'Robert Speicher2017-12-1531-94/+151
|\ \ \ | |_|/ |/| |
| * | Backport changes from EELin Jen-Shin2017-12-151-1/+1
| * | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-12-15557-4085/+6448
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-30218-1768/+3336
| |\ \ \
| * | | | 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-22133-1005/+1254
| |\ \ \ \
| * | | | | Move ModuleWithInstanceVariables to Gitlab namespaceLin Jen-Shin2017-11-2223-82/+82
| * | | | | Updates based on feedbackLin Jen-Shin2017-11-221-4/+1
| * | | | | Use StrongMemoize and enable/disable cops properlyLin Jen-Shin2017-11-1824-84/+101
| * | | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-17344-3379/+6110
| |\ \ \ \ \
| * | | | | | WIPLin Jen-Shin2017-11-068-29/+24
| * | | | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-06952-14321/+17091
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-09-25209-1675/+4828
| |\ \ \ \ \ \ \
| * | | | | | | | Allow simple ivar ||= form. Update accordinglyLin Jen-Shin2017-09-1925-34/+43
| * | | | | | | | Add cop to make sure we don't use ivar in a moduleLin Jen-Shin2017-09-1837-2/+44
* | | | | | | | | fix issue #39843 Incorrect guidance stating blocked users will be removed fro...Cesar Apodaca2017-12-151-1/+0
* | | | | | | | | Merge branch '38239-update-toggle-design' into 'master'Filipa Lacerda2017-12-154-48/+65
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | 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-151-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Replace factory_girl_rails with factory_bot_railsrc/use-factory_bot_railsRémy Coutable2017-12-141-1/+1
* | | | | | | | | | Merge branch 'ph-more-es-modules' into 'master'Filipa Lacerda2017-12-159-492/+463
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Export JS classes as modulesph-more-es-modulesPhil Hughes2017-12-159-492/+463
* | | | | | | | | | | 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
* | | | | | | | | | | | Merge branch 'dm-ldap-email-readonly' into 'master'Sean McGivern2017-12-153-5/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Make sure user email is read only when synced with LDAPDouwe Maan2017-12-153-5/+11
* | | | | | | | | | | | | Fix UX issues in system info pageGilbert Roulot2017-12-151-3/+3
* | | | | | | | | | | | | Merge branch '41136-job-erased' into 'master'Filipa Lacerda2017-12-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Change text from build to job in flash notice41136-job-erasedAnnabel Dunstone Gray2017-12-141-1/+1
* | | | | | | | | | | | | | Merge branch '38541-cancel-alignment' into 'master'Filipa Lacerda2017-12-151-6/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | fix button alignment on MWPS component38541-cancel-alignmentSimon Knox2017-12-111-6/+13
* | | | | | | | | | | | | | Merge branch 'lfs-badge' into 'master'Douwe Maan2017-12-155-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | moved lfs_blob_ids method into ExtractsPath modulelfs-badgePhil Hughes2017-12-142-8/+1
| * | | | | | | | | | | | | moved lfs blob fetch from extractspath filePhil Hughes2017-12-144-2/+11
| * | | | | | | | | | | | | fixed project homepage not having correct variablePhil Hughes2017-12-111-1/+0
| * | | | | | | | | | | | | Added LFS badge to indicate LFS tracked filesPhil Hughes2017-12-114-0/+12
* | | | | | | | | | | | | | Merge branch 'feature/migrate-merge-base-to-gitaly' into 'master'Robert Speicher2017-12-142-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Migrate Gitlab::Git::Repository#merge_base_commit to Gitalyfeature/migrate-merge-base-to-gitalyAhmad Sherif2017-12-132-2/+5
* | | | | | | | | | | | | | Merge branch 'ph-es-modules' into 'master'Filipa Lacerda2017-12-149-119/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Converted JS modules into exported modulesph-es-modulesPhil Hughes2017-12-149-119/+65
* | | | | | | | | | | | | | Merge branch 'dm-batchloader-project' into 'master'Sean McGivern2017-12-141-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Include project in BatchLoader key to prevent returning blobs for the wrong p...Douwe Maan2017-12-141-3/+9
| |/ / / / / / / / / / / / /
View Lorry Controller Status