summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* [ci skip] Add Approve and Remove Approval to UX Guide terminology tableux-guide-update-mr-copyawhildy2016-11-211-1/+3
* Merge branch 'dz-fix-500-group-git' into 'master' Sean McGivern2016-11-213-2/+6
|\
| * Fix 500 error when group name ends with gitDmitriy Zaporozhets2016-11-213-2/+6
* | Merge branch 'chatops-deploy-command' into 'master' Rémy Coutable2016-11-2110-16/+220
|\ \
| * | Fix specs and improve code readabilityKamil Trzcinski2016-11-212-4/+5
| * | Introduce deploy command that allows to start deployment from one environment...chatops-deploy-commandKamil Trzcinski2016-11-218-9/+156
| * | Add deploy chat command [ci skip]Kamil Trzcinski2016-11-214-14/+70
* | | Merge branch 'feature/send-registry-address-with-build-payload' into 'master' Kamil Trzciński2016-11-219-0/+196
|\ \ \
| * | | Add Gitlab::Ci::Build::Credentials module with build credentials abstractionTomasz Maczukin2016-11-218-25/+145
| * | | Send credentials array with build dataTomasz Maczukin2016-11-215-19/+58
| * | | Send registry_url with build data to GitLab RunnerTomasz Maczukin2016-11-162-0/+33
| * | | Update CHANGELOGTomasz Maczukin2016-11-161-0/+4
* | | | Merge branch 'fix-folders' into 'master' Fatih Acet2016-11-211-1/+3
|\ \ \ \
| * | | | Remove statementFilipa Lacerda2016-11-211-2/+0
| * | | | Fix permissions errorFilipa Lacerda2016-11-211-1/+5
* | | | | Merge branch '24499-fix-activity-autoload-on-large-viewports' into 'master' Fatih Acet2016-11-219-107/+119
|\ \ \ \ \
| * | | | | fix some code style issues according to feedback24499-fix-activity-autoload-on-large-viewportsMike Greiling2016-11-212-12/+16
| * | | | | add CHANGELOG entry for !7608Mike Greiling2016-11-201-0/+4
| * | | | | prevent infinite loop when no content is returnedMike Greiling2016-11-201-1/+1
| * | | | | continue to auto-load content while the window is not scrollableMike Greiling2016-11-201-5/+16
| * | | | | use param defaults and add spacing for readabilityMike Greiling2016-11-201-4/+7
| * | | | | convert pager.js to es6 syntaxMike Greiling2016-11-201-36/+28
| * | | | | rename pager.js to pager.js.es6Mike Greiling2016-11-201-0/+0
| * | | | | convert activities.js to es6 class syntaxMike Greiling2016-11-205-33/+31
| * | | | | rename activities.js to activities.js.es6Mike Greiling2016-11-201-0/+0
* | | | | | Merge branch 'hide-empty-merge-request-diffs' into 'master' Sean McGivern2016-11-219-37/+57
|\ \ \ \ \ \
| * | | | | | Hide box with CI status when there are no changes in merge requestAdam Niedzielski2016-11-211-1/+1
| * | | | | | Return valid response in Projects::MergeRequestsController#ci_status when dif...Adam Niedzielski2016-11-211-1/+1
| * | | | | | Warn that branch does not exist instead of saying that there isAdam Niedzielski2016-11-212-2/+32
| * | | | | | Hide empty merge request diffs when comparing versionsAdam Niedzielski2016-11-214-7/+14
| * | | | | | Revert "Do not create a MergeRequestDiff record when source branch is deleted"Adam Niedzielski2016-11-213-26/+9
* | | | | | | Merge branch 'fix/cycle-analytics-no-data' into 'master' Sean McGivern2016-11-212-5/+58
|\ \ \ \ \ \ \
| * | | | | | | Updated code based on feedbackfix/cycle-analytics-no-dataJames Lopez2016-11-212-7/+3
| * | | | | | | rename methodJames Lopez2016-11-211-2/+2
| * | | | | | | Adds a flag to reflect whether or not there is data in cycle analyticsJames Lopez2016-11-212-5/+62
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'fix-xss-vulnerability' into 'master' Fatih Acet2016-11-216-38/+37
|\ \ \ \ \ \ \
| * | | | | | | Fixes identationfix-xss-vulnerabilityFilipa Lacerda2016-11-212-6/+4
| * | | | | | | Fix after reviewFilipa Lacerda2016-11-213-12/+6
| * | | | | | | Remove v-htmlFilipa Lacerda2016-11-215-26/+33
* | | | | | | | Merge branch 'grapify-project-snippet-api' into 'master' Rémy Coutable2016-11-212-92/+128
|\ \ \ \ \ \ \ \
| * | | | | | | | Grapify the projects snippet APIgrapify-project-snippet-apiRobert Schilling2016-11-212-92/+128
* | | | | | | | | Merge branch 'smarter-cache-invalidation' into 'master' Sean McGivern2016-11-2114-512/+782
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added CHANGELOG entry for !7360smarter-cache-invalidationYorick Peterse2016-11-211-0/+4
| * | | | | | | | | Refactor cache refreshing/expiringYorick Peterse2016-11-2110-556/+605
| * | | | | | | | | Use File.exist? to check if a repository existsYorick Peterse2016-11-212-7/+8
| * | | | | | | | | Unify detecting of special repository filesYorick Peterse2016-11-215-16/+232
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'issue_24303' into 'master' Sean McGivern2016-11-215-32/+70
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Allow JIRA references for project snippetsissue_24303Felipe Artur2016-11-215-32/+70
* | | | | | | | | Merge branch 'fix/cycle-analytics-permissions' into 'master' Sean McGivern2016-11-215-1/+183
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | refactored a couple of things based on feedbackfix/cycle-analytics-permissionsJames Lopez2016-11-2110-25/+19