summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Capitalize button textfix-button-titleAlfredo Sumaran2016-06-211-1/+1
* Merge branch '18787-user-img-compare' into 'master' Dmitriy Zaporozhets2016-06-211-23/+24
|\
| * Align avatar and text within commit row18787-user-img-compareAnnabel Dunstone2016-06-201-23/+24
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-06-216-13/+28
|\ \
| * \ Merge branch 'notification-dropdown-active-fix' into 'master' Jacob Schatz2016-06-211-1/+1
| |\ \
| | * | Updated tests to not look for flash messagenotification-dropdown-active-fixPhil Hughes2016-06-211-1/+1
| * | | Merge branch 'blank-state' into 'master' Jacob Schatz2016-06-213-9/+24
| |\ \ \
| | * | | Tests updateblank-statePhil Hughes2016-06-211-2/+3
| | * | | Moved new environment link to below blank state textPhil Hughes2016-06-211-1/+5
| | * | | Updated blank state for environments and deploymentsPhil Hughes2016-06-213-9/+19
| | |/ /
| * | | Merge branch '18743-sidebar-pin-tooltip' into 'master' Jacob Schatz2016-06-211-1/+1
| |\ \ \
| | * | | Add tooltip on pin/unpin navAnnabel Dunstone2016-06-211-1/+1
| | |/ /
| * | | Merge branch 'fix/builds-api-nil-commit' into 'master' Rémy Coutable2016-06-211-2/+2
| |\ \ \
| | * | | Rename commit_data in Pipeline to commitfix/builds-api-nil-commitGrzegorz Bizon2016-06-211-2/+2
* | | | | Merge branch '18881-horizontal-nav-arrow'Dmitriy Zaporozhets2016-06-216-0/+12
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add arrow in horizontal scroll fadeAnnabel Dunstone2016-06-206-0/+12
| | |_|/ | |/| |
* | | | Merge branch 'show-image-id-on-registry-page' into 'master' Rémy Coutable2016-06-211-3/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Show proper image ID on registry pageKamil Trzcinski2016-06-211-3/+3
* | | | Merge branch '17521-gitlab-ci-yml-templates' into 'master' Jacob Schatz2016-06-212-0/+6
|\ \ \ \
| * | | | Add button to add .gitlab-ci.yml file17521-gitlab-ci-yml-templatesAlfredo Sumaran2016-06-201-0/+4
| * | | | Add GitLab CI Yml dropdown selectorAlfredo Sumaran2016-06-201-0/+2
* | | | | Merge branch 'feature/runner-lock-on-project' into 'master' Rémy Coutable2016-06-215-9/+20
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Update wordings according to:Lin Jen-Shin2016-06-213-4/+4
| * | | | Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr...feature/runner-lock-on-projectLin Jen-Shin2016-06-203-4/+4
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr...Lin Jen-Shin2016-06-2040-184/+517
| |\ \ \ \
| * | | | | Rename according to:Lin Jen-Shin2016-06-202-7/+7
| * | | | | Use .has-tooltip as suggested at:Lin Jen-Shin2016-06-201-2/+1
| * | | | | Test for enabling/disabling runners from admin runner pageLin Jen-Shin2016-06-171-2/+2
| * | | | | Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr...Lin Jen-Shin2016-06-17119-1089/+1302
| |\ \ \ \ \
| * | | | | | Use font awesome instead of Unicode. Feedback from:Lin Jen-Shin2016-06-151-1/+2
| * | | | | | Merge branch 'master' into feature/runner-lock-on-projectLin Jen-Shin2016-06-1463-496/+448
| |\ \ \ \ \ \
| * | | | | | | Add a small locked icon if it's locked:Lin Jen-Shin2016-06-091-0/+2
| * | | | | | | Updated description for the formLin Jen-Shin2016-06-091-2/+2
| * | | | | | | WIP, try to add views for locked runnersLin Jen-Shin2016-06-092-0/+9
* | | | | | | | Merge branch 'lbennett/gitlab-ce-18114-add-up-arrow-edit-shortcut-documentati...Jacob Schatz2016-06-201-1/+5
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Added shortcut to help shortcuts viewlbennett/gitlab-ce-18114-add-up-arrow-edit-shortcut-documentationLuke "Jared" Bennett2016-06-171-1/+5
* | | | | | | | Merge branch 'note-emoji-system-note' into 'master' Jacob Schatz2016-06-201-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Uses not when checking for system notenote-emoji-system-notePhil Hughes2016-06-171-2/+2
| * | | | | | | | Hides award emoji & access level on system notesPhil Hughes2016-06-131-2/+2
* | | | | | | | | Merge branch 'async-refs-dropdown' into 'master' Jacob Schatz2016-06-202-2/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed Ruby to use excludePhil Hughes2016-06-181-1/+1
| * | | | | | | | | Correctly adds commit ID into dropdownPhil Hughes2016-06-181-1/+2
| * | | | | | | | | Tests fix for ref switcherPhil Hughes2016-06-182-3/+2
| * | | | | | | | | Refs dropdown is now loaded asyncPhil Hughes2016-06-181-1/+8
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'markdowner' into 'master' Jacob Schatz2016-06-202-4/+13
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Made markdown buttons work on all markdown textareasPhil Hughes2016-06-172-12/+0
| * | | | | | | | Updated design of markdown buttonsPhil Hughes2016-06-171-24/+12
| * | | | | | | | Move buttons to upper right.Jacob Schatz2016-06-172-12/+24
| * | | | | | | | Revert _form fileJacob Schatz2016-06-171-2/+3
| * | | | | | | | Fix syntax error. Remove whitespaceJacob Schatz2016-06-171-2/+2