summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'file-view-container' into 'master' Jacob Schatz2017-04-101-3/+3
|\
| * Remove limited container on file viewfile-view-containerAnnabel Dunstone Gray2017-04-071-3/+3
* | Merge branch '30676-project-export-email' into 'master' Sean McGivern2017-04-101-1/+1
|\ \
| * | Fix email not being sent after project exportmhasbini2017-04-091-1/+1
* | | Merge branch 'remove_is_admin' into 'master' Robert Speicher2017-04-091-1/+1
|\ \ \
| * | | Remove the User#is_admin? methodblackst0ne2017-04-091-1/+1
| |/ /
* | | Add a name field to the group edit formadd-field-for-group-nameDouglas Lovell2017-04-091-7/+11
|/ /
* | Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-076-3/+8
|\ \
| * \ 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
| * | Put back usernames in activity and profile feedAnnabel Dunstone Gray2017-04-074-0/+4
| |/
* | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-0716-7/+199
|\ \ | |/
| * Merge branch 'dosuken123/gitlab-ce-2989-run-cicd-pipelines-on-a-schedule-idea...Sean McGivern2017-04-073-0/+30
| |\
| | * Fix test failuresKamil Trzcinski2017-04-072-2/+2
| | * Simplify ifKamil Trzcinski2017-04-071-1/+1
| | * Update code to remove no longer needed changesKamil Trzcinski2017-04-071-6/+0
| | * Update tests to cover trigger scheduleKamil Trzcinski2017-04-071-11/+6
| | * Fix ref referenceKamil Trzcinski2017-04-072-21/+36
| | * N/A to None. Revert validates from validates_presence_of.Shinya Maeda2017-04-071-1/+1
| | * Add def trigger_schedule in Trigger. Use persisted? for checling existanceShinya Maeda2017-04-071-1/+1
| | * Use allow_destroy. Remove condtion from form.haml.Shinya Maeda2017-04-071-5/+2
| | * Add form for scheduled triggerShinya Maeda2017-04-073-1/+30
| * | Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master' Douwe Maan2017-04-0713-7/+169
| |\ \
| | * | Show Flash message above Tags list18471-restrict-tag-pushes-protected-tagsKushal Pandya2017-04-071-1/+3
| | * | Documentation for protected tagsJames Edwards-Jones2017-04-071-3/+3
| | * | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-0646-171/+241
| | |\ \
| | * \ \ Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tagsJames Edwards-Jones2017-04-0615-17/+95
| | |\ \ \
| | * | | | Fixes as per feedbackKushal Pandya2017-04-061-1/+1
| | * | | | Protected Tags backend review changesJames Edwards-Jones2017-04-063-9/+9
| | * | | | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-06114-651/+808
| | |\ \ \ \
| | * | | | | Renamed ProtectedTag push_access_levels to create_access_levelsJames Edwards-Jones2017-04-043-10/+10
| | * | | | | Protected Tags prevents all updates instead of just force pushes.James Edwards-Jones2017-04-041-2/+2
| | * | | | | Moved Project#protected_branch? to ProtectedBranch, similar for tagsJames Edwards-Jones2017-04-031-1/+1
| | * | | | | Update column widthsKushal Pandya2017-04-031-2/+2
| | * | | | | Render Push levels dropdownKushal Pandya2017-04-031-3/+3
| | * | | | | Added ‘protected’ label and disabled delete button for tags index/showJames Edwards-Jones2017-03-312-2/+10
| | * | | | | Added ProtectedTags#show pageJames Edwards-Jones2017-03-312-0/+34
| | * | | | | Protected tags can be added/listed via UIJames Edwards-Jones2017-03-315-8/+54
| | * | | | | Update property names for tagsKushal Pandya2017-03-213-4/+4
| | * | | | | Render protected tags within Project Settings > RepositoryKushal Pandya2017-03-211-0/+1
| | * | | | | Protect tag partialKushal Pandya2017-03-214-0/+71
* | | | | | | Review changesLuke "Jared" Bennett2017-04-071-1/+1
* | | | | | | Add link to list itemsLuke "Jared" Bennett2017-04-071-13/+15
* | | | | | | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-073-6/+13
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'metrics-button-misplaced' into 'master' Annabel Dunstone Gray2017-04-071-1/+1
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Moved the monitoring button inside the show view for the environments pagemetrics-button-misplacedJose Ivan Vargas2017-04-061-1/+1
| * | | | | | Merge branch 'dz-hide-zero-counter' into 'master' Dmitriy Zaporozhets2017-04-071-5/+7
| |\ \ \ \ \ \
| | * | | | | | Hide header counters for issue/mr/todos if zerodz-hide-zero-counterDmitriy Zaporozhets2017-04-071-5/+7
| * | | | | | | Update droplabLuke "Jared" Bennett2017-04-071-1/+1