Commit Graph
51 Commits
Author SHA1 Message Date
Kamil Trzcinski dbf235f514 Fix tests failures 2016-06-07 10:25:57 +02:00
Kamil Trzcinski 842f0a3401 Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2
# Conflicts:
#	features/steps/shared/builds.rb
#	spec/requests/ci/api/builds_spec.rb
2016-06-06 11:21:39 +02:00
Kamil Trzcinski 7ad7e10fee Merge remote-tracking branch 'origin/master' into rename-ci-commit 2016-06-06 11:20:17 +02:00
Kamil Trzcinski 836061ddfd Rename remaining ci_commits in specs 2016-06-03 16:28:15 +02:00
Kamil Trzcinski 20c7144ed2 Rename all [ci_]commit to [ci_]pipeline in specs and features 2016-06-03 16:22:26 +02:00
Z.J. van de Weg 9d491712cf Merge branch 'master' into awardables 2016-06-03 15:20:11 +02:00
Kamil Trzcinski 717fdd6d42 Rename Ci::Build commit to pipeline 2016-06-03 12:29:00 +02:00
Rémy Coutable 4581e71c44 Merge branch 'fix/error-500-in-pipeline-when-fork' into 'master'
Use project that belongs to pipeline in view

## What does this MR do?

This MR makes project in pipelines view match the one that pipeline has been created for.

Closes #17943 

See merge request !4376
2016-06-01 12:37:51 +00:00
Z.J. van de Weg 91a7b9333b Incorportate feedback 2016-06-01 12:10:08 +02:00
Grzegorz Bizon 02cddaea6f Add feature specs for pipeline in MR from fork 2016-06-01 11:57:22 +02:00
Grzegorz Bizon 24c0f0d671 Add feature test for accessing MR created from fork 2016-06-01 11:57:22 +02:00
Felipe Artur 30e61ed79c Fix error 500 when sorting issues by milestone due date and filtering by labels 2016-05-31 10:35:57 -03:00
ZJ van de Weg f99b38c9d5 Remove tests specific for awards on notes 2016-05-26 13:20:26 +02:00
Phil HughesandFatih Acet 783a5ae98c Adds the emoji menu to the body and then re-positions it depending on which button clicked
This spots bugs where the menu could be in a div that has overflow hidden on ie. diff comments
2016-05-19 14:13:16 -05:00
Phil HughesandFatih Acet bf96c30510 Award spec for merge requests 2016-05-19 14:13:10 -05:00
Takuya Noguchi 0d93e93e79 Add tests for unintentional filtering bug in MR (cf. !3872) 2016-05-15 09:18:23 +09:00
Rémy Coutable a278b36ab0 Fix an issue when filtering merge requests with more than one label
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-10 19:07:46 +02:00
Robert Speicher c9bc3d20ef Merge remote-tracking branch 'dev/master' into 'master' 2016-05-02 19:58:54 -04:00
Alfredo Sumaran 5ba79f49a4 Syntax and code improvements 2016-04-26 14:01:40 -05:00
Alfredo Sumaran 7f263ca1de Use variables instead of let 2016-04-26 14:01:40 -05:00
Alfredo Sumaran 0392dffdb6 Update wording 2016-04-26 14:01:40 -05:00
Alfredo Sumaran 89df29e09f Use click_link 2016-04-26 14:01:40 -05:00
Alfredo Sumaran 5d5df26ab1 Add documentation for "Hide whitespace changes" button 2016-04-26 14:01:40 -05:00
Alfredo Sumaran a1a9a1cf8d Specs for toggle Whitespaces Changes 2016-04-26 14:01:40 -05:00
Rémy CoutableandRobert Speicher cd0750e045 Prevent private project name and namespace from leaking in the new MR view
Fixes #15591.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-25 15:32:44 -04:00
Jacob Schatz 692c35e6f4 Merge branch 'multi-filter-labels' into 'master'
Mutliple label filter

Fixes #989 

See merge request !3438
2016-04-20 19:18:32 +00:00
Douwe Maan 5dba777695 Add tests 2016-04-20 14:28:43 +02:00
Arinde Eniola a0a423fee7 fix failing tests 2016-04-15 18:18:31 +01:00
Jacob Schatz e1838980c6 Merge branch 'fix_quick_submit_missing_in_edit_merge_request' into 'master'
Fix quick submit missing in edit merge request page

closes #14953 

![fix](/uploads/5b80b37330929514c81299b4c8fe3efb/fix.gif)

See merge request !3601
2016-04-12 17:15:52 +00:00
Arinde Eniola 400a1ae04d add some changes to the test 2016-04-07 23:44:59 +01:00
Arinde Eniola 451314df96 add test 2016-04-07 20:51:16 +01:00
Phil Hughes 39ecce05c7 Build fix 2016-04-06 16:25:38 +01:00
Stan Hu 7877138958 Fix creation of merge requests for orphaned branches
Closes #14875
2016-04-04 04:51:05 -07:00
Phil Hughes 6a3d8ac207 Spec updates 2016-03-29 18:20:10 +01:00
Phil Hughes 31fea92295 Updated based on Ruby feedback 2016-03-29 15:26:12 +01:00
Phil Hughes c9dea7761d Added tests for upcoming milestone filter 2016-03-29 11:57:04 +01:00
Phil Hughes 16d02de56e Fixed issue with dashboard issues not reloading 2016-03-18 11:40:16 +00:00
Phil Hughes ee9a6d7fb3 Fixed failing milestone filter tests 2016-03-10 13:54:54 +00:00
Douwe Maan 8eb51dc037 Fix updating and disabling merge button when Merge Immediately is clicked 2015-12-16 19:27:46 +01:00
Kamil Trzcinski 73b04bebad Fix errors 2015-12-11 18:02:09 +01:00
Douwe Maan 903151141d Tweak specs 2015-12-09 09:59:39 +01:00
Zeger-Jan van de Weg e7969d6f6c Satisfy Douwe Maan 2015-12-07 13:41:18 +01:00
Zeger-Jan van de Weg 6eb75ed6ad Fix specs 2015-12-07 11:29:23 +01:00
Zeger-Jan van de Weg 46278ec7ba Button fix 2015-12-07 09:59:16 +01:00
Zeger-Jan van de Weg 2462a96e45 Incorporate feedback 2015-12-05 15:42:38 +01:00
Zeger-Jan van de Weg a7682f8775 Specs for 'Merge When Build Succeeds' 2015-12-02 13:27:16 +01:00
Stan HuandRobert Speicher 098ced4faa Improve features to ensure Ajax filter has actually executed 2015-07-08 15:57:24 -04:00
Robert Speicher 098ad0a5b4 Remove "mystery guest" from Milestone filtering features 2015-07-08 15:49:37 -04:00
Robert Speicher 4b4351a18c Add feature tag to feature specs
Not to be confused with the RSpec `type: :feature` tag, this tag is used
by the `spec:feature` Rake task for filtering/grouping specs.
2015-07-06 22:39:55 -04:00
Robert Speicher d00cb00d6b Rename NoMilestone to Milestone::None
Also refactors IssuableFinder to avoid redundant title check.
2015-07-06 22:39:55 -04:00