summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '18787-user-img-compare' into 'master' Dmitriy Zaporozhets2016-06-212-25/+34
|\
| * Align avatar and text within commit row18787-user-img-compareAnnabel Dunstone2016-06-202-25/+34
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-06-2116-34/+118
|\ \
| * \ Merge branch 'notification-dropdown-active-fix' into 'master' Jacob Schatz2016-06-214-6/+7
| |\ \
| | * | Updated tests to not look for flash messagenotification-dropdown-active-fixPhil Hughes2016-06-211-1/+1
| | * | Fixed issue with notification dropdownn not updating activePhil Hughes2016-06-213-5/+6
| * | | Merge branch '18590-banzai-filter-relativelinkfilter-is-slow' into 'master' Yorick Peterse2016-06-211-0/+26
| |\ \ \
| | * | | Optimize Banzai::Filter::RelativeLinkFilterAlejandro Rodríguez2016-06-211-0/+26
| | |/ /
| * | | Merge branch 'blank-state' into 'master' Jacob Schatz2016-06-215-9/+48
| |\ \ \
| | * | | 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-215-9/+43
| | |/ /
| * | | Merge branch '18743-sidebar-pin-tooltip' into 'master' Jacob Schatz2016-06-212-12/+28
| |\ \ \
| | * | | Fix tooltip title and persist state18743-sidebar-pin-tooltipAlfredo Sumaran2016-06-211-13/+27
| | * | | Add tooltip on pin/unpin navAnnabel Dunstone2016-06-212-1/+3
| * | | | Merge branch 'fix/builds-api-nil-commit' into 'master' Rémy Coutable2016-06-214-7/+9
| |\ \ \ \
| | * | | | Rename commit_data in Pipeline to commitfix/builds-api-nil-commitGrzegorz Bizon2016-06-214-15/+9
| | * | | | Fix builds API response not including commit dataGrzegorz Bizon2016-06-211-0/+8
* | | | | | Merge branch '18881-horizontal-nav-arrow'Dmitriy Zaporozhets2016-06-217-0/+27
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add arrow in horizontal scroll fadeAnnabel Dunstone2016-06-207-0/+27
| | |_|_|/ | |/| | |
* | | | | 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 'backport_from_ee' into 'master' Valery Sizov2016-06-211-1/+1
|\ \ \ \ \ \
| * | | | | | Fix on-hover state for 'Edit' button on tree viewValery Sizov2016-06-211-1/+1
* | | | | | | Merge branch '18792-cache-participants-call' into 'master' Yorick Peterse2016-06-211-0/+10
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Cache Participable#participants in instance variablePaco Guzman2016-06-211-0/+10
* | | | | | | Merge branch '17521-gitlab-ci-yml-templates' into 'master' Jacob Schatz2016-06-217-8/+56
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add button to add .gitlab-ci.yml file17521-gitlab-ci-yml-templatesAlfredo Sumaran2016-06-201-0/+4
| * | | | | | Incorporate reviewZ.J. van de Weg2016-06-203-6/+6
| * | | | | | Add GitLab CI Yml dropdown selectorAlfredo Sumaran2016-06-205-2/+42
| * | | | | | Implement backend gitlab ci dropdownZ.J. van de Weg2016-06-201-4/+10
| * | | | | | Refactor Gitlab::GitignoresZJ van de Weg2016-06-201-5/+3
* | | | | | | Merge branch 'feature/runner-lock-on-project' into 'master' Rémy Coutable2016-06-2111-30/+54
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | 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-205-7/+20
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr...Lin Jen-Shin2016-06-20101-413/+1359
| |\ \ \ \ \ \
| * | | | | | | Rename according to:Lin Jen-Shin2016-06-204-13/+13
| * | | | | | | 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
| * | | | | | | Admin::RunnerProjectsController#index is not usedremove-admin-runner-projectsLin Jen-Shin2016-06-171-5/+0
| * | | | | | | Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr...Lin Jen-Shin2016-06-17240-1998/+3105
| |\ \ \ \ \ \ \
| * | | | | | | | Fix typo. It's ivar and the column was called lockedLin Jen-Shin2016-06-161-1/+1
| * | | | | | | | Use FIXME instead, feedback from:Lin Jen-Shin2016-06-161-2/+2
| * | | | | | | | Use font awesome instead of Unicode. Feedback from:Lin Jen-Shin2016-06-151-1/+2
| * | | | | | | | Fix typo. It's ivar and the column was called lockedLin Jen-Shin2016-06-151-1/+1
| * | | | | | | | Return the association and check it in controller instead:Lin Jen-Shin2016-06-143-3/+6
| * | | | | | | | Merge branch 'prefer-assign_to' into feature/runner-lock-on-projectLin Jen-Shin2016-06-141-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Give 409 Conflict whenever the runner was already enabledprefer-assign_toLin Jen-Shin2016-06-141-1/+1
| | * | | | | | | | We're checking return value rather than rescuing exceptionsLin Jen-Shin2016-06-141-1/+1
| * | | | | | | | | Merge branch 'master' into feature/runner-lock-on-projectLin Jen-Shin2016-06-14130-929/+1154
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /