Commit Graph
5821 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
Dmitriy Zaporozhets 3321f694b8 Merge branch 'fix-milestone-snippet-header' into 'master'
Fix headers of milestone and snippet show pages

Fix layout, and move "Edit" button to very right just like issue/MR.

Before:

![Screen_Shot_2015-12-15_at_17.33.20](/uploads/dbbeb6868b80e21894159126a0feca6a/Screen_Shot_2015-12-15_at_17.33.20.png)

![Screen_Shot_2015-12-15_at_17.33.28](/uploads/53d10b42adc34e48b063889120e9a746/Screen_Shot_2015-12-15_at_17.33.28.png)

After:

![Screen_Shot_2015-12-15_at_17.34.25](/uploads/b0d0ea3f6a7b61d51b474419207f7a02/Screen_Shot_2015-12-15_at_17.34.25.png)

![Screen_Shot_2015-12-15_at_17.35.55](/uploads/65b922f5249655d3733740690577c9d7/Screen_Shot_2015-12-15_at_17.35.55.png)

cc @skyruler 

cc @rspeicher 8.3 please!

See merge request !2104
2015-12-16 17:59:28 +00:00
Dmitriy Zaporozhets 28832fef7c Merge branch 'issuable-sidebar' into 'master'
Issuable sidebar tweaks

- Move cross-project reference down 
- ~~Fix "Notifications" label color~~ Reverted
- ~~Use regularly colored button for "Subscribe"/"Unsubscribe"~~ Reverted

Before:

![Screen_Shot_2015-12-15_at_17.38.08](/uploads/d4eeab44bb21fca2fe9ebe620ed9e060/Screen_Shot_2015-12-15_at_17.38.08.png)

After:

(Only the moved cross-project reference is still relevant, other changes have been reverted)

![Screen_Shot_2015-12-15_at_17.38.23](/uploads/b61aed3a0884c986785a5b09af8dbb25/Screen_Shot_2015-12-15_at_17.38.23.png)

cc @skyruler 

cc @rspeicher 8.3 please!

See merge request !2105
2015-12-16 15:54:10 +00:00
Douwe Maan 5fc90eec50 Link to correct (source) project on MR builds tab 2015-12-16 16:47:39 +01:00
Douwe Maan ff16ee63e6 Revert "Fix "Notifications" label color"
This reverts commit e4e1777aa5.
2015-12-16 16:23:31 +01:00
Douwe Maan f4c94e1fd6 Revert "Use regularly colored button for "Subscribe"/"Unsubscribe""
This reverts commit c1db8d1590.
2015-12-16 16:23:18 +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
Douwe Maan d60047bb31 Merge branch 'remove-author-from-email' into 'master'
Revert "Make sure notify email always has author info."

This reverts commit 303f79f804.

See merge request !2103
2015-12-16 13:51:45 +00:00
Douwe Maan e07c9c1ee1 Merge branch 'rs-clipboard-fixes' into 'master'
Fix clipboard buttons on MR instructions and Commit#show



See merge request !2108
2015-12-16 13:30:15 +00:00
Andrey 37a4e4945d Merge branch 'fix-profile-nav' into 'master'
Make profile navigation full wide

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

## Before


![Administrator___GitLab](/uploads/a43e8992264ed78afa732e7a911ef154/Administrator___GitLab.png)

## After

![Administrator___GitLab1](/uploads/9e67e8af071d4879045311abe15a7bba/Administrator___GitLab1.png)

See merge request !2076
2015-12-16 10:57:02 +00: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 c1db8d1590 Use regularly colored button for "Subscribe"/"Unsubscribe" 2015-12-15 17:33:03 +01:00
Douwe Maan e4e1777aa5 Fix "Notifications" label color 2015-12-15 17:32:46 +01:00
Douwe Maan 297398ea32 Move cross-project reference down 2015-12-15 17:32:37 +01:00
Douwe Maan 5413960b1a Fix headers of milestone and snippet show pages 2015-12-15 17:29:37 +01:00
Job van der Voort ddd806c66f Revert "Make sure notify email always has author info."
This reverts commit 303f79f804.
2015-12-15 16:45:52 +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
Grzegorz Bizon 76a17d4f54 Merge branch 'master' into ci/persist-registration-token
* master:
  Move CI admin builds and runners specs to correct directory
  Fix 500 when viewing specific runners on runners page
  Fix Ci::Project migration not migrating columns that cannot be NULL
  Fix MySQL migration of CI emails
  Minor fix in flow 'Merge when build succeeds'
2015-12-14 13:00:25 +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 2ec93abed7 Merge branch 'master' into ci/persist-registration-token
* master: (66 commits)
  Fix runners admin view
  Fix migrations
  Rename mention of gitlab-git-http-server to gitlab-workhorse
  Bump Redis requirement to 2.8 for Sidekiq 4 requirements
  Fix wording on runner setup page
  add details on how to change saml button label
  Fix tests
  Move awards back to gray panel and few improvements to sidebar
  Few UI improvements to new sidebar implementation
  Fix tests for new issuable sidebar
  Update changelog
  Implement new sidebar for merge request page
  Make edit link on issuable sidebar works
  Redesign issue page for new sidebar
  Move awards css to separate file
  Implement issuable sidebar partial
  Update CHANGELOG
  Clarify cache behavior
  Run builds from projects with enabled CI
  Use Gitlab::Git instead of Ci::Git
  ...

Conflicts:
	db/schema.rb
2015-12-14 12:26:40 +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
Kamil Trzcinski baa38f0dc1 Fix runners admin view [ci skip] 2015-12-14 11:30:53 +01: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
Stan Hu 885bfe3bdc Merge pull request #9839 from huacnlee/fix/add-author-info-into-note-messages
Make sure notify email always has author info.
2015-12-11 23:40:22 -08:00
Dmitriy Zaporozhets 51c8d037d3 Make profile navigation full wide
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-11 20:39:26 +01: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 b4ea6ad16a Few UI improvements to new sidebar implementation
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-11 20:11:23 +01:00
Dmitriy Zaporozhets 617ba01322 Fix tests for new issuable sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-11 20:11:23 +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
Dmitriy Zaporozhets f7bba47f8a Implement issuable sidebar partial
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-11 20:09:04 +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