Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '18787-user-img-compare' into 'master' | Dmitriy Zaporozhets | 2016-06-21 | 2 | -25/+34 |
|\ | |||||
| * | Align avatar and text within commit row18787-user-img-compare | Annabel Dunstone | 2016-06-20 | 2 | -25/+34 |
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2016-06-21 | 16 | -34/+118 |
|\ \ | |||||
| * \ | Merge branch 'notification-dropdown-active-fix' into 'master' | Jacob Schatz | 2016-06-21 | 4 | -6/+7 |
| |\ \ | |||||
| | * | | Updated tests to not look for flash messagenotification-dropdown-active-fix | Phil Hughes | 2016-06-21 | 1 | -1/+1 |
| | * | | Fixed issue with notification dropdownn not updating active | Phil Hughes | 2016-06-21 | 3 | -5/+6 |
| * | | | Merge branch '18590-banzai-filter-relativelinkfilter-is-slow' into 'master' | Yorick Peterse | 2016-06-21 | 1 | -0/+26 |
| |\ \ \ | |||||
| | * | | | Optimize Banzai::Filter::RelativeLinkFilter | Alejandro Rodríguez | 2016-06-21 | 1 | -0/+26 |
| | |/ / | |||||
| * | | | Merge branch 'blank-state' into 'master' | Jacob Schatz | 2016-06-21 | 5 | -9/+48 |
| |\ \ \ | |||||
| | * | | | Tests updateblank-state | Phil Hughes | 2016-06-21 | 1 | -2/+3 |
| | * | | | Moved new environment link to below blank state text | Phil Hughes | 2016-06-21 | 1 | -1/+5 |
| | * | | | Updated blank state for environments and deployments | Phil Hughes | 2016-06-21 | 5 | -9/+43 |
| | |/ / | |||||
| * | | | Merge branch '18743-sidebar-pin-tooltip' into 'master' | Jacob Schatz | 2016-06-21 | 2 | -12/+28 |
| |\ \ \ | |||||
| | * | | | Fix tooltip title and persist state18743-sidebar-pin-tooltip | Alfredo Sumaran | 2016-06-21 | 1 | -13/+27 |
| | * | | | Add tooltip on pin/unpin nav | Annabel Dunstone | 2016-06-21 | 2 | -1/+3 |
| * | | | | Merge branch 'fix/builds-api-nil-commit' into 'master' | Rémy Coutable | 2016-06-21 | 4 | -7/+9 |
| |\ \ \ \ | |||||
| | * | | | | Rename commit_data in Pipeline to commitfix/builds-api-nil-commit | Grzegorz Bizon | 2016-06-21 | 4 | -15/+9 |
| | * | | | | Fix builds API response not including commit data | Grzegorz Bizon | 2016-06-21 | 1 | -0/+8 |
* | | | | | | Merge branch '18881-horizontal-nav-arrow' | Dmitriy Zaporozhets | 2016-06-21 | 7 | -0/+27 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Add arrow in horizontal scroll fade | Annabel Dunstone | 2016-06-20 | 7 | -0/+27 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'show-image-id-on-registry-page' into 'master' | Rémy Coutable | 2016-06-21 | 1 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Show proper image ID on registry page | Kamil Trzcinski | 2016-06-21 | 1 | -3/+3 |
* | | | | | | Merge branch 'backport_from_ee' into 'master' | Valery Sizov | 2016-06-21 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix on-hover state for 'Edit' button on tree view | Valery Sizov | 2016-06-21 | 1 | -1/+1 |
* | | | | | | | Merge branch '18792-cache-participants-call' into 'master' | Yorick Peterse | 2016-06-21 | 1 | -0/+10 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Cache Participable#participants in instance variable | Paco Guzman | 2016-06-21 | 1 | -0/+10 |
* | | | | | | | Merge branch '17521-gitlab-ci-yml-templates' into 'master' | Jacob Schatz | 2016-06-21 | 7 | -8/+56 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Add button to add .gitlab-ci.yml file17521-gitlab-ci-yml-templates | Alfredo Sumaran | 2016-06-20 | 1 | -0/+4 |
| * | | | | | | Incorporate review | Z.J. van de Weg | 2016-06-20 | 3 | -6/+6 |
| * | | | | | | Add GitLab CI Yml dropdown selector | Alfredo Sumaran | 2016-06-20 | 5 | -2/+42 |
| * | | | | | | Implement backend gitlab ci dropdown | Z.J. van de Weg | 2016-06-20 | 1 | -4/+10 |
| * | | | | | | Refactor Gitlab::Gitignores | ZJ van de Weg | 2016-06-20 | 1 | -5/+3 |
* | | | | | | | Merge branch 'feature/runner-lock-on-project' into 'master' | Rémy Coutable | 2016-06-21 | 11 | -30/+54 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Update wordings according to: | Lin Jen-Shin | 2016-06-21 | 3 | -4/+4 |
| * | | | | | | Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr...feature/runner-lock-on-project | Lin Jen-Shin | 2016-06-20 | 5 | -7/+20 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr... | Lin Jen-Shin | 2016-06-20 | 101 | -413/+1359 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Rename according to: | Lin Jen-Shin | 2016-06-20 | 4 | -13/+13 |
| * | | | | | | | Use .has-tooltip as suggested at: | Lin Jen-Shin | 2016-06-20 | 1 | -2/+1 |
| * | | | | | | | Test for enabling/disabling runners from admin runner page | Lin Jen-Shin | 2016-06-17 | 1 | -2/+2 |
| * | | | | | | | Admin::RunnerProjectsController#index is not usedremove-admin-runner-projects | Lin Jen-Shin | 2016-06-17 | 1 | -5/+0 |
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr... | Lin Jen-Shin | 2016-06-17 | 240 | -1998/+3105 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix typo. It's ivar and the column was called locked | Lin Jen-Shin | 2016-06-16 | 1 | -1/+1 |
| * | | | | | | | | Use FIXME instead, feedback from: | Lin Jen-Shin | 2016-06-16 | 1 | -2/+2 |
| * | | | | | | | | Use font awesome instead of Unicode. Feedback from: | Lin Jen-Shin | 2016-06-15 | 1 | -1/+2 |
| * | | | | | | | | Fix typo. It's ivar and the column was called locked | Lin Jen-Shin | 2016-06-15 | 1 | -1/+1 |
| * | | | | | | | | Return the association and check it in controller instead: | Lin Jen-Shin | 2016-06-14 | 3 | -3/+6 |
| * | | | | | | | | Merge branch 'prefer-assign_to' into feature/runner-lock-on-project | Lin Jen-Shin | 2016-06-14 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Give 409 Conflict whenever the runner was already enabledprefer-assign_to | Lin Jen-Shin | 2016-06-14 | 1 | -1/+1 |
| | * | | | | | | | | We're checking return value rather than rescuing exceptions | Lin Jen-Shin | 2016-06-14 | 1 | -1/+1 |
| * | | | | | | | | | Merge branch 'master' into feature/runner-lock-on-project | Lin Jen-Shin | 2016-06-14 | 130 | -929/+1154 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / |