summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Fix sidekiq stats in admin areablackst0ne2016-11-231-0/+23
* Merge branch 'fix/ci-linter-undefined-error' into 'master' Kamil Trzciński2016-11-221-18/+33
|\
| * Fix entry lookup in CI config inheritance rulesGrzegorz Bizon2016-11-221-1/+3
| * Extend specs for global ci configuration entryGrzegorz Bizon2016-11-221-18/+31
* | Merge branch 'backport-tt' into 'master' Jacob Schatz2016-11-223-0/+358
|\ \
| * | Backport SmartInterval, PrettyTime, SubbableResource from EE.backport-ttBryce Johnson2016-11-183-0/+358
* | | Merge branch '20840-getting-started-better-empty-state-for-issues-view' into ...Jacob Schatz2016-11-222-5/+10
|\ \ \
| * | | Added empty state svg and set up blank conditional20840-getting-started-better-empty-state-for-issues-viewLuke "Jared" Bennett2016-11-182-5/+10
* | | | Merge branch 'improve-deploy-message' into 'master' Kamil Trzciński2016-11-212-6/+9
|\ \ \ \
| * | | | Improve deploy command messageKamil Trzcinski2016-11-212-6/+9
* | | | | Merge branch 'dz-fix-500-group-git' into 'master' Sean McGivern2016-11-211-1/+1
|\ \ \ \ \
| * | | | | Fix 500 error when group name ends with gitDmitriy Zaporozhets2016-11-211-1/+1
* | | | | | Merge branch 'chatops-deploy-command' into 'master' Rémy Coutable2016-11-214-2/+135
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Fix specs and improve code readabilityKamil Trzcinski2016-11-211-2/+3
| * | | | | Introduce deploy command that allows to start deployment from one environment...chatops-deploy-commandKamil Trzcinski2016-11-214-2/+134
* | | | | | Merge branch 'feature/send-registry-address-with-build-payload' into 'master' Kamil Trzciński2016-11-213-0/+118
|\ \ \ \ \ \
| * | | | | | Add Gitlab::Ci::Build::Credentials module with build credentials abstractionTomasz Maczukin2016-11-213-1/+80
| * | | | | | Send credentials array with build dataTomasz Maczukin2016-11-211-15/+25
| * | | | | | Send registry_url with build data to GitLab RunnerTomasz Maczukin2016-11-161-0/+29
* | | | | | | Merge branch '24499-fix-activity-autoload-on-large-viewports' into 'master' Fatih Acet2016-11-211-1/+1
|\ \ \ \ \ \ \
| * | | | | | | convert activities.js to es6 class syntaxMike Greiling2016-11-201-1/+1
* | | | | | | | Merge branch 'hide-empty-merge-request-diffs' into 'master' Sean McGivern2016-11-213-13/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | Warn that branch does not exist instead of saying that there isAdam Niedzielski2016-11-211-0/+30
| * | | | | | | | Hide empty merge request diffs when comparing versionsAdam Niedzielski2016-11-211-3/+4
| * | | | | | | | Revert "Do not create a MergeRequestDiff record when source branch is deleted"Adam Niedzielski2016-11-211-10/+0
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'fix/cycle-analytics-no-data' into 'master' Sean McGivern2016-11-211-0/+43
|\ \ \ \ \ \ \ \
| * | | | | | | | Updated code based on feedbackfix/cycle-analytics-no-dataJames Lopez2016-11-211-2/+2
| * | | | | | | | Adds a flag to reflect whether or not there is data in cycle analyticsJames Lopez2016-11-211-0/+43
* | | | | | | | | Merge branch 'fix-xss-vulnerability' into 'master' Fatih Acet2016-11-211-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove v-htmlFilipa Lacerda2016-11-211-1/+1
* | | | | | | | | | Merge branch 'grapify-project-snippet-api' into 'master' Rémy Coutable2016-11-211-14/+50
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Grapify the projects snippet APIgrapify-project-snippet-apiRobert Schilling2016-11-211-14/+50
* | | | | | | | | | | Merge branch 'smarter-cache-invalidation' into 'master' Sean McGivern2016-11-217-284/+454
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Refactor cache refreshing/expiringYorick Peterse2016-11-216-334/+352
| * | | | | | | | | | | Use File.exist? to check if a repository existsYorick Peterse2016-11-211-2/+1
| * | | | | | | | | | | Unify detecting of special repository filesYorick Peterse2016-11-212-0/+153
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'issue_24303' into 'master' Sean McGivern2016-11-211-17/+48
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Allow JIRA references for project snippetsissue_24303Felipe Artur2016-11-211-17/+48
* | | | | | | | | | | Merge branch 'fix/cycle-analytics-permissions' into 'master' Sean McGivern2016-11-211-0/+127
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | refactored a couple of things based on feedbackfix/cycle-analytics-permissionsJames Lopez2016-11-217-7/+7
| * | | | | | | | | | | fix spec failureJames Lopez2016-11-211-1/+1
| * | | | | | | | | | | Added permissions per stage to cycle analytics endpointJames Lopez2016-11-219-8/+135
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '24552-js-environment-timeago-is-not-rendered-and-text-shows-obj...Fatih Acet2016-11-211-1/+53
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix timeago rendering for environment timeago24552-js-environment-timeago-is-not-rendered-and-text-shows-object-object-in-mr-widgetClement Ho2016-11-191-1/+53
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch '24616-mr-shows-the-build-for-this-merge-request-failed-although...Kamil Trzciński2016-11-214-10/+55
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix a wrong "The build for this merge request failed" message24616-mr-shows-the-build-for-this-merge-request-failed-although-builds-still-runningRémy Coutable2016-11-214-10/+55
* | | | | | | | | | | Merge branch 'fix/do-not-add-todo-when-build-allowed-to-fail' into 'master' 24710-external-statuses-pipelineKamil Trzciński2016-11-211-5/+28
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Do not create TODO when build is allowed to failGrzegorz Bizon2016-11-211-5/+28
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'grapify-users-api' into 'master' Rémy Coutable2016-11-211-27/+49
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Grapify the users APIgrapify-users-apiRobert Schilling2016-11-211-27/+49