summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix_sidekiq_stats_in_admin_area' into 'master' Robert Speicher2016-11-231-0/+23
|\
| * Fix sidekiq stats in admin areablackst0ne2016-11-231-0/+23
* | Merge branch '24756-clean-up-eslintrc-globals' into 'master' Alfredo Sumaran2016-11-233-2/+10
|\ \
| * | clean up globals exemptions within .eslintrcMike Greiling2016-11-223-2/+10
* | | Merge branch 'disable-calendar-deselection' into 'master' Fatih Acet2016-11-221-0/+41
|\ \ \
| * | | Fix deselecting calendar days on contribution graphClement Ho2016-11-041-0/+41
* | | | Merge branch 'emoji-btn-disabled' into 'master' Fatih Acet2016-11-221-41/+52
|\ \ \ \
| * | | | Disabled award emoji button when user is not logged inemoji-btn-disabledPhil Hughes2016-11-221-41/+52
| | |_|/ | |/| |
* | | | Merge branch 'fix/build-without-trace-exceptions' into 'master' Kamil Trzciński2016-11-222-79/+118
|\ \ \ \
| * | | | Improve name of build log state data attributefix/build-without-trace-exceptionsGrzegorz Bizon2016-11-221-1/+1
| * | | | Improve reproducibility of build trace test exampleGrzegorz Bizon2016-11-221-2/+4
| * | | | Add missing feature tests for loading build traceGrzegorz Bizon2016-11-221-4/+16
| * | | | Add missing specs for loading build HTML traceGrzegorz Bizon2016-11-221-7/+23
| * | | | Refactor feature tests for project builds pageGrzegorz Bizon2016-11-221-75/+84
* | | | | Merge branch 'fix/cycle-analytics-duration' into 'master' James Lopez2016-11-221-1/+9
|\ \ \ \ \
| * | | | | fix rubocop warningfix/cycle-analytics-durationJames Lopez2016-11-221-1/+1
| * | | | | fixed bug to do with calculating durationsJames Lopez2016-11-221-1/+9
| | |_|_|/ | |/| | |
* | | | | Merge branch 'zj-fix-trailing-whitespace-issue-create' into 'master' Kamil Trzciński2016-11-221-0/+9
|\ \ \ \ \
| * | | | | Issue creation now accepts trailing whitespacezj-fix-trailing-whitespace-issue-createZ.J. van de Weg2016-11-221-0/+9
| | |/ / / | |/| | |
* | | | | Merge branch 'rs-project-team-helpers' into 'master' Sean McGivern2016-11-224-62/+69
|\ \ \ \ \
| * | | | | Add shortcuts for adding users to a project team with a specific rolers-project-team-helpersRobert Speicher2016-11-184-62/+69
* | | | | | Merge branch '24576_cant_stop_impersonating' into 'master' Sean McGivern2016-11-221-7/+21
|\ \ \ \ \ \
| * | | | | | Allow admins to stop impersonating users without e-mail addressesOren Kanner2016-11-171-7/+21
* | | | | | | Merge branch 'fix-api-iid-filter' into 'master' Rémy Coutable2016-11-222-0/+19
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fix IID filter for merge requests and milestonesRobert Schilling2016-11-222-0/+19
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'zj-mattermost-command-help-message' into 'master' Fatih Acet2016-11-222-0/+48
|\ \ \ \ \ \
| * | | | | | Improve the mattermost help boxZ.J. van de Weg2016-11-212-0/+48
* | | | | | | Merge branch 'fix-failed-email-for-external-jobs' into 'master' Kamil Trzciński2016-11-221-0/+3
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Just create failed builds rather than calling eventsLin Jen-Shin2016-11-221-6/+3
| * | | | | | External jobs do not have show page nor tracesLin Jen-Shin2016-11-211-1/+7
* | | | | | | 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