summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'remove_is_admin' into 'master' Robert Speicher2017-04-097-12/+8
|\
| * Remove the User#is_admin? methodblackst0ne2017-04-097-12/+8
* | Add a name field to the group edit formadd-field-for-group-nameDouglas Lovell2017-04-093-9/+36
|/
* Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-079-6/+11
|\
| * Merge branch 'dm-remove-copy-link-on-blame-page' into 'master' Douwe Maan2017-04-082-3/+4
| |\
| | * Rename displaying_blame to blamedm-remove-copy-link-on-blame-pageDouwe Maan2017-04-072-4/+4
| | * Don't show Copy contents button on Blame pageDouwe Maan2017-04-072-3/+4
| * | Merge branch 'safari-svg-bug' into 'master' Jacob Schatz2017-04-072-2/+2
| |\ \
| | * | Give explicit height to SVG icons for SafariAnnabel Dunstone Gray2017-04-072-2/+2
| | |/
| * | Merge branch 'activity-feed-user-name' into 'master' Annabel Dunstone Gray2017-04-074-0/+4
| |\ \
| | * | Put back usernames in activity and profile feedAnnabel Dunstone Gray2017-04-074-0/+4
| | |/
| * | Update MR title change iconAnnabel Dunstone Gray2017-04-071-1/+1
| |/
* | alfredo review changesLuke "Jared" Bennett2017-04-071-1/+1
* | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-0762-307/+848
|\ \ | |/
| * Remove Vue from main bundle and disable production warningsMike Greiling2017-04-076-24/+16
| * Merge branch 'dosuken123/gitlab-ce-2989-run-cicd-pipelines-on-a-schedule-idea...Sean McGivern2017-04-077-14/+60
| |\
| | * Fix test failuresKamil Trzcinski2017-04-073-4/+5
| | * Simplify ifKamil Trzcinski2017-04-071-1/+1
| | * Update code to remove no longer needed changesKamil Trzcinski2017-04-072-7/+1
| | * Update tests to cover trigger scheduleKamil Trzcinski2017-04-071-11/+6
| | * Fix ref referenceKamil Trzcinski2017-04-076-36/+49
| | * N/A to None. Revert validates from validates_presence_of.Shinya Maeda2017-04-072-2/+2
| | * create_params and update_params into trigger_paramsShinya Maeda2017-04-071-11/+4
| | * Add def trigger_schedule in Trigger. Use persisted? for checling existanceShinya Maeda2017-04-074-3/+5
| | * before_create :set_project. Now TriggerSchedule saves project from parentShinya Maeda2017-04-071-1/+5
| | * Use allow_destroy. Remove condtion from form.haml.Shinya Maeda2017-04-074-24/+13
| | * Add form for scheduled triggerShinya Maeda2017-04-077-4/+59
| * | Merge branch 'optimise-builds' into 'master' Sean McGivern2017-04-072-1/+6
| |\ \
| | * | Count number of queriesKamil Trzcinski2017-04-072-1/+6
| * | | Merge branch 'karma-failure-fix' into 'master' Jacob Schatz2017-04-071-3/+3
| |\ \ \
| | * | | Fixed duplicate jQuery AJAX spyonkarma-failure-fixPhil Hughes2017-04-071-3/+3
| * | | | Merge branch 'bvl-fix-project-ci-status-cache' into 'master' Kamil Trzciński2017-04-074-93/+3
| |\ \ \ \
| | * | | | Use `Ci::ExpirePipelineCacheService` to set `ProjectPipelinestatus`bvl-fix-project-ci-status-cacheBob Van Landuyt2017-04-072-5/+2
| | * | | | Rename `ProjectBuildStatus` -> `ProjectPipelineStatus`Bob Van Landuyt2017-04-072-2/+2
| | * | | | Wrap updating of cache after pipeline transition in class methodBob Van Landuyt2017-04-071-1/+1
| | * | | | Update project build status cache when transitioningBob Van Landuyt2017-04-071-3/+2
| | * | | | Rename Ci::PipelineStatus -> Ci::ProjectBuildStatusBob Van Landuyt2017-04-073-88/+2
| * | | | | Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master' Douwe Maan2017-04-0743-171/+759
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Show Flash message above Tags list18471-restrict-tag-pushes-protected-tagsKushal Pandya2017-04-073-2/+8
| | * | | | Documentation for protected tagsJames Edwards-Jones2017-04-071-3/+3
| | * | | | Protected tags changes from backend maintainer reviewJames Edwards-Jones2017-04-072-2/+4
| | * | | | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-06109-653/+1639
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tagsJames Edwards-Jones2017-04-0669-148/+778
| | |\ \ \ \ \
| | * | | | | | Fixes as per feedbackKushal Pandya2017-04-068-20/+20
| | * | | | | | Protected Tags backend review changesJames Edwards-Jones2017-04-0614-63/+46
| | * | | | | | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-06431-2863/+5707
| | |\ \ \ \ \ \
| | * | | | | | | Add constructor doc, toggle helperKushal Pandya2017-04-061-8/+18
| | * | | | | | | Import Protected Tags classesKushal Pandya2017-04-061-2/+3
| | * | | | | | | Re-export classes using ES6 `export`Kushal Pandya2017-04-061-5/+5
| | * | | | | | | Convert to pure ES6 classKushal Pandya2017-04-065-146/+132
View Lorry Controller Status