Commit Graph
2450 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 4b7c9c7fe2 Revert sidebar position for issue and merge request
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-17 10:34:15 +01:00
Dmitriy Zaporozhets 3162a5a293 Fix ux issue with "This issue will be closed automatically" message
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-17 00:04:29 +01:00
Dmitriy Zaporozhets a9b078535b Merge branch 'move-mr-builds-tab' into 'master'
Move MR Builds tab next to Commits

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/4132

@dzaporozhets We've got two people who feel strongly about this now, @sytses filed an issue for it :)

![Screen_Shot_2015-12-16_at_22.19.35](/uploads/37e705610ba54e386928d7972398c247/Screen_Shot_2015-12-16_at_22.19.35.png)


See merge request !2128
2015-12-16 22:44:52 +00:00
Douwe Maan 6493fd3d58 Move MR Builds tab next to Commits 2015-12-16 22:18:19 +01:00
Douwe Maan 2d0f9dd02e Fix merge widget JS for buttons 2015-12-16 19:53:38 +01:00
Douwe Maan 76708c2c18 Merge branch 'master' into fix-merge-immediately-button 2015-12-16 19:43:52 +01:00
Douwe Maan 8eb51dc037 Fix updating and disabling merge button when Merge Immediately is clicked 2015-12-16 19:27:46 +01:00
Dmitriy Zaporozhets 6374bdb352 Merge branch 'mr-builds-fixes' into 'master'
Link to correct (source) project on MR builds tab

Used to link to `gitlab-org/gitlab-ce/commits/<branch-name>`, now links to correct project.

See merge request !2115
2015-12-16 18:16:03 +00:00
Douwe Maan 5fc90eec50 Link to correct (source) project on MR builds tab 2015-12-16 16:47:39 +01:00
Douwe Maan 79c90821ac Rename .issuable-details to .detail-page (and -header and -description) 2015-12-16 16:13:22 +01:00
Douwe Maan 41d6b3701e Merge branch 'master' into fix-milestone-snippet-header 2015-12-16 15:56:23 +01:00
Robert Speicher f49ac5c8d3 Fix clipboard buttons on MR instructions and Commit#show 2015-12-15 16:11:01 -05:00
Douwe Maan 9dfe43c83b Move milestone edit button to the very right 2015-12-15 17:36:08 +01:00
Douwe Maan 5413960b1a Fix headers of milestone and snippet show pages 2015-12-15 17:29:37 +01:00
Grzegorz BizonandGrzegorz Bizon 6fb120d1b0 Assign notes object to a variable 2015-12-15 14:19:35 +01:00
Douglas Barbosa Alexandre 5afe03315d Preserve trailing new lines at the end of file on the online editor
Because Haml automatically indents the HTML source code, the contents
of whitespace-sensitive tags like pre and textarea can get screwed up.
2015-12-14 18:22:28 -02:00
Grzegorz Bizon 4526515704 Merge branch 'ux/suppress-ci-yml-warning' into 'master'
Suppress warning about missing `.gitlab-ci.yml` if builds are disabled

When user disables GitLab Ci Service in project's settings then warning
about missing `.gitlab-ci.yml` file should be supressed. This a matter
of user experience as stated in #3761 (closes #3761).

cc @ayufan 

See merge request !2014
2015-12-14 17:16:29 +00:00
Kamil Trzcinski cb4b4c5786 Fix 500 when viewing specific runners on runners page [ci skip] 2015-12-14 12:46:26 +01:00
Grzegorz Bizon 32d83ee79f Merge branch 'master' into ux/suppress-ci-yml-warning
* master: (24 commits)
  Fix runners admin view
  Fix migrations
  Run builds from projects with enabled CI
  Use Gitlab::Git instead of Ci::Git
  Fix last specs
  Fix specs
  Fix after column rename
  Fix errors
  Update badge
  Finishing touches
  Fix triggers tests
  Rename columns and rename migrations
  Reimplement Trigger API
  Remove ci_ prefix from all ci related things
  Add runners token
  Migrate CI::Project to Project
  Fix indentation and BuildsEmailService
  Change default values
  Enhance migrate CI emails
  Fix issue tracker service
  ...

Conflicts:
	spec/features/commits_spec.rb
2015-12-14 12:25:37 +01:00
Douwe Maan 45593d574c Merge branch 'tweak-flow-merge-when-build-succeeds' into 'master'
Minor fix in flow 'Merge when build succeeds'

When a user, which is not the merge user, want to removes the source branch
after the automatic merge this might fail because of checks in the
DeleteBranchService

/cc @DouweM 

See merge request !2070
2015-12-14 11:00:44 +00:00
Kamil Trzciński c810234357 Merge branch 'ci-project-migrate' into 'master'
Ci Project migrate

- This doesn't migrate: allow_git_fetch, coverage_regex, timeout. Since this are project configuration settings I would propose to migrate them to `.gitlab-ci.yml`.
- This requires offline migrations.
- It simplifies database models making all CI objects to be attached to: Project.
- It removes Ci::Project, but makes /ci/projects working by adding method: Project.find_by_ci_id for backward compatibility (badges, triggers).
- We should add default `timeout` to Application Settings.
- It misses specs.
- It is based on ci-services-migrate for now.
- It removes CI events.
- It removes administrator CI projects overview.
- It removes CI application settings.

In 8.4 or 8.5 we can remove redundant tables and columns.


See merge request !1987
2015-12-14 10:35:40 +00:00
Kamil Trzciński e81ae1e68c Merge branch 'ci-services-migrate' into 'master'
Ci Services migrate



See merge request !1985
2015-12-14 10:32:57 +00:00
Grzegorz Bizon b8f67c5e47 Do not display ci build status if builds enabled but no .gitlab-ci.yml
Ref #3827
2015-12-14 11:28:49 +01:00
Robert Speicher a5e449571b Merge branch 'fix-shared-runner-wording' into 'master'
Fix wording on "runners" page

An attempt to be a bit more specific and clear on the "runners" page.

[ci skip]

See merge request !2066
2015-12-12 17:15:37 +00:00
Pelle 0b60723d1c Fix wording on runner setup page 2015-12-12 09:48:32 +00:00
Dmitriy Zaporozhets 03a5df9974 Merge branch 'ui-right-sidebar' into 'master'
Implement new sidebar for issue and merge request pages

This is first step in implementing #3981. We don't have new dropdowns yet so I used some workarounds. 
Also I did it from linux machine without having access to design materials. So some colors/paddings might not match - but I will improve it with next iteration. 

cc @creamzy @JobV 

See merge request !2058
2015-12-11 19:30:20 +00:00
Dmitriy Zaporozhets 1911811438 Move awards back to gray panel and few improvements to sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-11 20:12:18 +01:00
Dmitriy Zaporozhets c6c244315a Implement new sidebar for merge request page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-11 20:11:23 +01:00
Dmitriy Zaporozhets b0591ff03a Redesign issue page for new sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-11 20:11:23 +01:00
Robert Speicher 6738b03902 Merge branch 'fix-typo' into 'master'
Fix typo

[ci skip]

See merge request !2035
2015-12-11 19:08:09 +00:00
Kamil Trzcinski 1c0683da7b Fix last specs 2015-12-11 18:02:10 +01:00
Kamil Trzcinski dd8102f2d1 Fix specs 2015-12-11 18:02:10 +01:00
Kamil Trzcinski 513d551c8f Fix after column rename 2015-12-11 18:02:10 +01:00
Kamil Trzcinski 73b04bebad Fix errors 2015-12-11 18:02:09 +01:00
Kamil Trzcinski 1e2a4895c8 Finishing touches 2015-12-11 18:02:09 +01:00
Kamil Trzcinski 3d9ce37a48 Reimplement Trigger API 2015-12-11 18:02:09 +01:00
Kamil Trzcinski 64bfd9d71a Remove ci_ prefix from all ci related things 2015-12-11 18:02:09 +01:00
Kamil Trzcinski e80e3f5372 Migrate CI::Project to Project 2015-12-11 18:02:09 +01:00
Greg Smethells 0272f27401 display referenced merge requests in issue description with CI status 2015-12-11 10:14:55 -06:00
Zeger-Jan van de Weg 5983e9bdf2 Minor fix in flow 'Merge when build succeeds'
When a user, which is not the merge user, want to removes the source branch
after the automatic merge this might fail because of checks in the
DeleteBranchService
2015-12-11 16:06:17 +01:00
Achilleas Pipinellis cdda827577 Remove check icon from merged requests
Now that GitLab CI exposes the status of each MR
in the MR page it seems "redundant" to have an
extra icon next to the CI statuses.
2015-12-10 20:45:54 +02:00
Zeger-Jan van de Weg b1fc531344 Fix typo 2015-12-10 18:19:49 +01:00
Kamil Trzcinski 2988e1fbf5 Migrate CI::Services and CI::WebHooks to Services and WebHooks 2015-12-10 16:04:08 +01:00
Douwe Maan 4e5897f51e Merge branch 'tmp-reference-pipeline-and-caching' into 'master'
[Second try] Implement different Markdown rendering pipelines and cache Markdown

!1602 already got merged in bcd89a58e7, but it would appear the merge commit disappeared because of #3816 (or some other reason).

cc @rspeicher 

See merge request !2051
2015-12-10 14:34:12 +00:00
Douwe Maan 3bfedbd25a Merge branch 'rs-snippets-clipboard' 2015-12-10 14:54:47 +01:00
Douwe Maan 10387f6b8a Merge branch 'master' into tmp-reference-pipeline-and-caching
# Conflicts:
#	spec/lib/gitlab/markdown/autolink_filter_spec.rb
#	spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/cross_project_reference_spec.rb
#	spec/lib/gitlab/markdown/emoji_filter_spec.rb
#	spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/external_link_filter_spec.rb
#	spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/label_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/redactor_filter_spec.rb
#	spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb
#	spec/lib/gitlab/markdown/relative_link_filter_spec.rb
#	spec/lib/gitlab/markdown/sanitization_filter_spec.rb
#	spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb
#	spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb
#	spec/lib/gitlab/markdown/task_list_filter_spec.rb
#	spec/lib/gitlab/markdown/upload_link_filter_spec.rb
#	spec/lib/gitlab/markdown/user_reference_filter_spec.rb
2015-12-10 14:04:34 +01:00
Dmitriy Zaporozhets 0549b5e8ee Merge pull request #9897 from atomaka/atomaka/bugfix/consistent-no-ssh-message
Fix inconsistency with no ssh key message
2015-12-10 01:28:53 +01:00
Dmitriy Zaporozhets d7044c5ccf Merge branch 'move-network' 2015-12-09 22:21:56 +01:00
Dmitriy Zaporozhets 8f6892500a Merge branch 'rs-delimit-build-counts' into 'master'
Add number_with_delimiter to build counts



See merge request !2046
2015-12-09 21:20:53 +00:00
Andrew Tomaka 48bf0a34e2 "No ssh" message should be same on project page 2015-12-09 16:11:21 -05:00