summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-filter-label-tooltip' into 'master' Fatih Acet2016-08-102-5/+12
|\
| * Fix filter label tooltip HTML renderingClement Ho2016-08-042-5/+12
* | Used cached value of project count to reduce DB loadRémy Coutable2016-08-101-1/+1
* | Merge branch 'zj-import-gitlab-fa-icon' into 'master' Rémy Coutable2016-08-101-26/+12
|\ \
| * | Remove duplicate link_to statementszj-import-gitlab-fa-iconZ.J. van de Weg2016-08-101-12/+6
| * | Use FA GitLab Icon for import project buttonZ.J. van de Weg2016-08-081-18/+10
* | | Merge branch 'add-caching-for-project-count' into 'master' Robert Speicher2016-08-091-0/+6
|\ \ \
| * | | Add a method in Project to return a cached value of total count of projectsStan Hu2016-08-091-0/+6
* | | | Merge branch 'adambuckland/gitlab-ce-19727-sort-submodules-with-files'Douwe Maan2016-08-092-15/+9
|\ \ \ \
| * | | | Update tree view to sort folders with submodulesAdam Buckland2016-08-092-15/+9
* | | | | Merge branch 'gh-pull-requests' into 'master' Douwe Maan2016-08-091-4/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Does not need to disable GitHub webhooks since PRs are check out locallyDouglas Barbosa Alexandre2016-08-041-4/+0
* | | | | Merge branch 'group-icon-alignment' into 'master' Jacob Schatz2016-08-091-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Align visibility icons on group pagegroup-icon-alignmentAnnabel Dunstone2016-07-251-1/+1
* | | | | Merge branch 'duduribeiro/gitlab-ce-current_password_when_auto_set'Rémy Coutable2016-08-091-0/+1
|\ \ \ \ \
| * | | | | Avoid to show the original password field when password is automatically setedCarlos Ribeiro2016-08-081-0/+1
* | | | | | Merge branch '20129-update-version_sorter-gem-to-optimize-tag-sorting' into '...Yorick Peterse2016-08-081-3/+1
|\ \ \ \ \ \
| * | | | | | Update version_sorter and use new interface for faster tag sortingAlejandro Rodríguez2016-08-081-3/+1
* | | | | | | Merge branch 'zj-enable-deploy-keys-api' into 'master' Douwe Maan2016-08-082-14/+23
|\ \ \ \ \ \ \
| * | | | | | | Namespace EnableDeployKeyService under ProjectsZ.J. van de Weg2016-08-083-15/+18
| * | | | | | | Create service for enabling deploy keysZ.J. van de Weg2016-08-052-14/+20
* | | | | | | | Merge branch 'git-http-push-check' into 'master' Robert Speicher2016-08-081-17/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | Stop 'git push' over HTTP earlyJacob Vosmaer2016-08-031-17/+22
* | | | | | | | | Merge branch 'patch-3' into 'master' Achilleas Pipinellis2016-08-081-1/+3
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | "This file is managed by gitlab-ctl. Manual changes will be erased!"Jeffrey Lin2016-08-081-1/+3
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'rubocop/EmptyLinesAroundModuleBody' into 'master' Douwe Maan2016-08-081-2/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Enable Style/EmptyLinesAroundModuleBody copGabriel Mazetto2016-08-061-2/+0
| |/ / / / / / /
* | | | | | | | Merge branch 'rubocop/SpaceAroundEqualsInParameterDefault' into 'master' Douwe Maan2016-08-085-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Enable Style/SpaceAroundEqualsInParameterDefault coprubocop/SpaceAroundEqualsInParameterDefaultGabriel Mazetto2016-08-065-5/+5
| |/ / / / / / /
* | | | | | | | Merge branch 'decode-log-postreceive-args' into 'master' Douwe Maan2016-08-081-0/+4
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Log base64-decoded PostReceive argumentsJacob Vosmaer2016-08-051-0/+4
* | | | | | | | Merge branch 'faster-cache-keys' into 'master' Rémy Coutable2016-08-083-0/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Added concern for a faster "cache_key" methodfaster-cache-keysYorick Peterse2016-08-083-0/+18
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-08-0842-347/+538
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'branch-permissions' into 'master' Jacob Schatz2016-08-0817-222/+343
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Ensure we are looking for the right dropdown inside the form wrapperbranch-permissionsAlfredo Sumaran2016-08-051-2/+2
| | * | | | | | | | Set for for labels and ID for dropdowns on create formAlfredo Sumaran2016-08-052-5/+6
| | * | | | | | | | Fix .panel-title styleAlfredo Sumaran2016-08-053-2/+9
| | * | | | | | | | Refine selector for form submit buttonAlfredo Sumaran2016-08-051-1/+1
| | * | | | | | | | Fix spelling. `braches` to `branches`Alfredo Sumaran2016-08-051-1/+1
| | * | | | | | | | Cache onSelect callback before passing to each dropdown instanceAlfredo Sumaran2016-08-051-7/+9
| | * | | | | | | | Prevent setting HTML directly from the JSAlfredo Sumaran2016-08-052-3/+4
| | * | | | | | | | camelCase param nameAlfredo Sumaran2016-08-051-4/+4
| | * | | | | | | | Wrap classes with IIFE and define it inside gl namespaceAlfredo Sumaran2016-08-055-121/+141
| | * | | | | | | | Add url to Wildcard protected branches documentationAlfredo Sumaran2016-08-051-1/+2
| | * | | | | | | | Create protected branch dropdown directlyAlfredo Sumaran2016-08-052-16/+5
| | * | | | | | | | Move classes into its own fileAlfredo Sumaran2016-08-052-13/+12
| | * | | | | | | | No need to pass event as a parameterAlfredo Sumaran2016-08-053-8/+6
| | * | | | | | | | Add custom css class to each dropdown to fix failing specAlfredo Sumaran2016-08-051-2/+2
| | * | | | | | | | Select first value by defaultAlfredo Sumaran2016-08-051-2/+11
View Lorry Controller Status