Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'cs-remove-inline-js' into 'master' | Fatih Acet | 2016-08-10 | 2 | -6/+0 |
|\ | |||||
| * | Removes two simple instances of inline JavaScript. | Connor Shea | 2016-07-26 | 2 | -6/+0 |
* | | Merge branch 'explicit-arguments-on-diff_file_html_data' into 'master' | Yorick Peterse | 2016-08-10 | 1 | -1/+1 |
|\ \ | |||||
| * | | Avoid commit lookup on diff_helperexplicit-arguments-on-diff_file_html_data | Paco Guzman | 2016-08-10 | 1 | -1/+1 |
* | | | Merge branch 'feature/svg-badge-template' into 'master' | Douwe Maan | 2016-08-10 | 1 | -0/+36 |
|\ \ \ | |||||
| * | | | Add missing space to generic badge templatefeature/svg-badge-template | Grzegorz Bizon | 2016-08-10 | 1 | -1/+1 |
| * | | | Merge branch 'master' into feature/svg-badge-template | Grzegorz Bizon | 2016-08-09 | 7 | -77/+80 |
| |\ \ \ | |||||
| * | | | | Improve indentation in svg badge template | Grzegorz Bizon | 2016-08-08 | 1 | -7/+18 |
| * | | | | Merge branch 'master' into feature/svg-badge-template | Grzegorz Bizon | 2016-08-08 | 58 | -225/+261 |
| |\ \ \ \ | |||||
| * | | | | | Use new badge template to render build status badge | Grzegorz Bizon | 2016-08-08 | 1 | -1/+1 |
| * | | | | | Add badge template to generic badge view template | Grzegorz Bizon | 2016-07-28 | 1 | -9/+9 |
| * | | | | | Add generic SVG badge template | Grzegorz Bizon | 2016-07-28 | 1 | -0/+25 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'fix-filter-label-tooltip' into 'master' | Fatih Acet | 2016-08-10 | 1 | -5/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix filter label tooltip HTML rendering | Clement Ho | 2016-08-04 | 1 | -5/+1 |
* | | | | | | Used cached value of project count to reduce DB load | Rémy Coutable | 2016-08-10 | 1 | -1/+1 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge branch 'zj-import-gitlab-fa-icon' into 'master' | Rémy Coutable | 2016-08-10 | 1 | -26/+12 |
|\ \ \ \ \ | |||||
| * | | | | | Remove duplicate link_to statementszj-import-gitlab-fa-icon | Z.J. van de Weg | 2016-08-10 | 1 | -12/+6 |
| * | | | | | Use FA GitLab Icon for import project button | Z.J. van de Weg | 2016-08-08 | 1 | -18/+10 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'adambuckland/gitlab-ce-19727-sort-submodules-with-files' | Douwe Maan | 2016-08-09 | 1 | -0/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Update tree view to sort folders with submodules | Adam Buckland | 2016-08-09 | 1 | -0/+6 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'gh-pull-requests' into 'master' | Douwe Maan | 2016-08-09 | 1 | -4/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Does not need to disable GitHub webhooks since PRs are check out locally | Douglas Barbosa Alexandre | 2016-08-04 | 1 | -4/+0 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'group-icon-alignment' into 'master' | Jacob Schatz | 2016-08-09 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Align visibility icons on group pagegroup-icon-alignment | Annabel Dunstone | 2016-07-25 | 1 | -1/+1 |
* | | | | | Merge branch 'patch-3' into 'master' | Achilleas Pipinellis | 2016-08-08 | 1 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | "This file is managed by gitlab-ctl. Manual changes will be erased!" | Jeffrey Lin | 2016-08-08 | 1 | -1/+3 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'branch-permissions' into 'master' | Jacob Schatz | 2016-08-08 | 5 | -75/+76 |
|\ \ \ \ \ | |||||
| * | | | | | Set for for labels and ID for dropdowns on create form | Alfredo Sumaran | 2016-08-05 | 1 | -5/+5 |
| * | | | | | Fix .panel-title style | Alfredo Sumaran | 2016-08-05 | 2 | -2/+4 |
| * | | | | | Fix spelling. `braches` to `branches` | Alfredo Sumaran | 2016-08-05 | 1 | -1/+1 |
| * | | | | | Prevent setting HTML directly from the JS | Alfredo Sumaran | 2016-08-05 | 1 | -1/+2 |
| * | | | | | Add url to Wildcard protected branches documentation | Alfredo Sumaran | 2016-08-05 | 1 | -1/+2 |
| * | | | | | Add custom css class to each dropdown to fix failing spec | Alfredo Sumaran | 2016-08-05 | 1 | -2/+2 |
| * | | | | | Fix class names and move each class to its own file | Alfredo Sumaran | 2016-08-05 | 1 | -5/+7 |
| * | | | | | Refactor of Protected Branch Edit List | Alfredo Sumaran | 2016-08-05 | 1 | -8/+7 |
| * | | | | | Update layout and JS for create protected branch. | Alfredo Sumaran | 2016-08-05 | 5 | -68/+64 |
| |/ / / / | |||||
* | | | | | Merge branch 'master' into 18256-secret-token-docs | Steve Halasz | 2016-08-05 | 17 | -44/+52 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '19752-pipelines-finished-at' into 'master' | Jacob Schatz | 2016-08-05 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Update timeago to shorter representation19752-pipelines-finished-at | Annabel Dunstone | 2016-08-04 | 1 | -1/+1 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge branch 'add_description_to_plain_text' into 'master' | Rémy Coutable | 2016-08-05 | 2 | -0/+4 |
| |\ \ \ \ | |||||
| | * | | | | Add description to text/plain emails | dixpac | 2016-08-04 | 2 | -0/+4 |
| * | | | | | Merge branch 'side-by-side-unfold' into 'master' | Douwe Maan | 2016-08-05 | 8 | -31/+34 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Add unfold links for Side-by-Side view | Tim Masliuchenko | 2016-08-04 | 8 | -31/+34 |
| * | | | | | Merge branch 'doc-artifacts-refactor' into 'master' | Achilleas Pipinellis | 2016-08-04 | 1 | -1/+4 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Refactor build artifacts documentation | Achilleas Pipinellis | 2016-08-04 | 1 | -1/+4 |
| | |/ / / | |||||
| * | | | | Merge branch 'devise-deprecations' into 'master' | Rémy Coutable | 2016-08-04 | 3 | -3/+3 |
| |\ \ \ \ | |||||
| | * | | | | Remove provider path, replace with dynamic path.devise-deprecations | Connor Shea | 2016-08-03 | 3 | -3/+3 |
| | * | | | | Add an oauth provider path helper. | Connor Shea | 2016-08-03 | 3 | -3/+3 |
| * | | | | | Merge branch 'fix/confusing-blocked-user-description' into 'master' | Achilleas Pipinellis | 2016-08-04 | 1 | -5/+3 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix confusing description of a blocked user. | Elias Werberich | 2016-08-02 | 1 | -5/+3 |