summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Simplify check for running job on Redis39032-improve-merge-ongoing-check-consistencyOswaldo Ferreira2017-10-132-2/+14
|
* Make "merge ongoing" check more consistentOswaldo Ferreira2017-10-111-1/+21
|
* Merge branch 'ph-gl-form-js-modules' into 'master'Filipa Lacerda2017-10-113-110/+99
|\ | | | | | | | | Moves form related JS modules out of global See merge request gitlab-org/gitlab-ce!14780
| * spec fixesph-gl-form-js-modulesPhil Hughes2017-10-112-19/+10
| |
| * Moves form related JS modules out of globalPhil Hughes2017-10-111-91/+89
| |
* | Merge branch 'backport-ee-change-for-test' into 'master'Rémy Coutable2017-10-112-6/+2
|\ \ | | | | | | | | | | | | Backport EE change for setting up forked project See merge request gitlab-org/gitlab-ce!14817
| * | Backport EE change for setting up forked projectbackport-ee-change-for-testLin Jen-Shin2017-10-112-6/+2
| | |
* | | Merge branch 'fix/pass-git-object-dir-attrs-as-relative' into 'master'Douwe Maan2017-10-112-22/+43
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Pass git object dir attributes as relative paths to Gitaly Closes gitaly#629 See merge request gitlab-org/gitlab-ce!14713
| * | Pass git object dir attributes as relative paths to GitalyAhmad Sherif2017-10-112-22/+43
| | | | | | | | | | | | Fixes gitaly#629
* | | Merge branch 'rs-mysql-groups-dashboard-failure' into 'master'Douwe Maan2017-10-111-10/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix a feature spec failing only on MySQL Closes #39003 See merge request gitlab-org/gitlab-ce!14811
| * | | Fix a feature spec failing only on MySQLrs-mysql-groups-dashboard-failureRobert Speicher2017-10-111-10/+10
| | | |
* | | | Merge branch 'move_markdown_preview_to_concern' into 'master'Sean McGivern2017-10-111-0/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for markdown preview to group milestones Closes #30241 See merge request gitlab-org/gitlab-ce!14806
| * | | | Add support for markdown preview to group milestonesmove_markdown_preview_to_concernVitaliy @blackst0ne Klachkov2017-10-111-0/+21
| | | | |
* | | | | Merge branch '35580-cannot-import-project-with-milestones' into 'master'Sean McGivern2017-10-113-80/+293
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | fix the import :milestone from adding the group_id Closes #35580 See merge request gitlab-org/gitlab-ce!14657
| * | | | fixing group label import35580-cannot-import-project-with-milestonesmicael.bergeron2017-10-061-2/+2
| | | | |
| * | | | adding the new spec filemicael.bergeron2017-10-061-0/+188
| | | | |
| * | | | fix the project import when an issue has a group milestonemicael.bergeron2017-10-052-79/+92
| | | | |
| * | | | fix the spec so it fails before applying the fixmicael.bergeron2017-10-042-4/+16
| | | | |
* | | | | Merge branch 'gitaly-has-local-branches' into 'master'Rémy Coutable2017-10-111-0/+11
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Use Gitaly's RepositoryService.HasLocalBranches RPC See merge request gitlab-org/gitlab-ce!14753
| * | | | Use Gitaly's RepositoryService.HasLocalBranches RPCgitaly-has-local-branchesAlejandro Rodríguez2017-10-101-0/+11
| | | | |
* | | | | Simplify project pageAnnabel Dunstone Gray2017-10-114-32/+38
| |_|_|/ |/| | |
* | | | Add explicit test to test resolved discussion toggle contentadd-resolve-discussion-testClement Ho2017-10-101-5/+15
|/ / /
* | | Fix unable to expand text diff discussion commentsClement Ho2017-10-101-6/+2
| | |
* | | Stop using `branch_names.include?` and use `branch_exists?`Andrew Newdigate2017-10-105-5/+5
| | |
* | | Merge branch '38869-u2f' into 'master'38968-label-picker-should-be-cleared-upon-selecting-a-labelPhil Hughes2017-10-103-151/+131
|\ \ \ | | | | | | | | | | | | | | | | Remove u2f from global namespace See merge request gitlab-org/gitlab-ce!14776
| * | | Remove u2f from globalnamespace38869-u2fFilipa Lacerda2017-10-093-151/+131
| | | |
* | | | Merge branch 'flash-es6-module' into 'master'Filipa Lacerda2017-10-103-6/+275
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Flash is now a ES6 module See merge request gitlab-org/gitlab-ce!14626
| * | | | fixed notes specsPhil Hughes2017-10-101-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | changed how the container class is added onto the text element more specs
| * | | | karma spec fixesPhil Hughes2017-10-102-5/+5
| | | | |
| * | | | fixed eslintPhil Hughes2017-10-101-3/+2
| | | | |
| * | | | flash testsPhil Hughes2017-10-101-0/+248
| | | | | | | | | | | | | | | | | | | | added back in documentation comment to flash file
| * | | | spec fixesPhil Hughes2017-10-101-1/+1
| | | | |
* | | | | Fix a liniting error introduced by !14652Ahmad Sherif2017-10-101-2/+2
| | | | |
* | | | | Merge branch '38245-private-avatars-are-not-cdn-compatible' into 'master'Douwe Maan2017-10-103-6/+49
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Private Avatars are not CDN compatible" Closes #38245 and gitlab-com/support-forum#2476 See merge request gitlab-org/gitlab-ce!14443
| * | | | | Fix for Lint Error + Upload TestTim Zallmann2017-10-091-1/+1
| | | | | |
| * | | | | Fixed TestsTim Zallmann2017-10-042-3/+3
| | | | | |
| * | | | | Fixed TestTim Zallmann2017-10-041-2/+1
| | | | | |
| * | | | | Fixed Linting errors + testsTim Zallmann2017-10-042-9/+10
| | | | | |
| * | | | | Created group_icon and group_icon_urlTim Zallmann2017-10-041-2/+45
| | | | | | | | | | | | | | | | | | | | | | | | Tests for these new helper methods
* | | | | | Merge branch '38941-lock-note-fix' into 'master'Sean McGivern2017-10-102-2/+40
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix text for the merge request lock system note Closes #38941 See merge request gitlab-org/gitlab-ce!14779
| * | | | | | Fix text for the merge request lock system noteJarka Kadlecova2017-10-102-2/+40
| | | | | | |
* | | | | | | Merge branch 'fix-timestampz-cop' into 'master'Grzegorz Bizon2017-10-101-0/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also warn on timestamp in datetime migration cop See merge request gitlab-org/gitlab-ce!14784
| * | | | | | | Also warn on timestamp in datetime migration copfix-timestampz-copSean McGivern2017-10-101-0/+26
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | The types `timestamp` and `datetime` are aliases: https://github.com/rails/rails/blob/v4.2.10/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb#L362-L364
* | | | | | | Remove Build code from global namespaceFilipa Lacerda2017-10-102-24/+23
| | | | | | |
* | | | | | | Merge branch 'feature/migrate-workhorse-send-git-diff-patch-to-gitaly' into ↵Robert Speicher2017-10-101-11/+55
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Migrate Workhorse Send{Diff,Patch} to Gitaly See merge request gitlab-org/gitlab-ce!14652
| * | | | | | Migrate Workhorse Send{Diff,Patch} to Gitalyfeature/migrate-workhorse-send-git-diff-patch-to-gitalyAhmad Sherif2017-10-091-11/+55
| | | | | | |
* | | | | | | Backports EE 38771 changes to CE.Tiago Botelho2017-10-102-0/+39
| |/ / / / / |/| | | | |
* | | | | | Fix bad type checking to prevent 0 count badge to be shownFilipa Lacerda2017-10-102-44/+39
| |_|/ / / |/| | | |
* | | | | Merge branch '34284-add-changes-to-issuable-webhook-data' into 'master'Douwe Maan2017-10-0910-69/+344
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include the changes in issuable webhook payloads Closes #34284 See merge request gitlab-org/gitlab-ce!14308
| * | | | | Introduce new hook data builders for Issue and MergeRequest34284-add-changes-to-issuable-webhook-dataRémy Coutable2017-10-097-113/+230
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
View Lorry Controller Status