Commit Graph
21718 Commits
Author SHA1 Message Date
Robert Speicher 19472158c8 Version 8.3.0.rc2 v8.3.0.rc2 2015-12-17 10:34:41 -05:00
Robert Speicher fa8e59cb85 Merge branch 'master' into 8-3-stable 2015-12-17 10:28:54 -05:00
Robert Speicher b2c593dac5 Merge branch 'gitlab-workhorse-0.5.1' into 'master'
Use gitlab-workhorse 0.5.1

Improves relative URL support.

See merge request !2134
2015-12-17 15:17:07 +00:00
Robert Speicher 9da5f0b927 Merge branch 'issue_4131' into 'master'
Upgrade Poltergeist to 1.8.1.

Close #4131 

See merge request !2126
2015-12-17 15:14:09 +00:00
Jacob Vosmaer b336eb01f7 Use gitlab-workhorse 0.5.1 2015-12-17 11:55:13 +01:00
Kamil Trzciński 110a5f9c96 Merge branch 'fix-migration' into 'master'
Fix ci_projects migration by using the value only from latest row [ci skip]

This is needed, because for some projects we have duplicate ci_projects.
This was introduced by lack of DB uniqueness on ci_projects.gitlab_id.

The MR fixes edge case by selecting value from latest.

/cc @yorickpeterse 

Fixes: gitlab-org/gitlab-ce#4123


See merge request !2133
2015-12-17 10:49:31 +00:00
Dmitriy Zaporozhets 61a1bdd7cc Merge branch 'revert-sidebar' into 'master'
Revert sidebar position for issue and merge request

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

cc @creamzy @skyruler 

See merge request !2132
2015-12-17 10:25:25 +00:00
Kamil Trzcinski e136a976b6 Fix ci_projects migration by using the value only from latest row [ci skip]
This is needed, because for some projects we have duplicate ci_projects.
This was introduced by lack of DB uniqueness on ci_projects.gitlab_id.
2015-12-17 11:09:59 +01:00
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 8dc4c7b4c7 Merge branch 'ux/closed-message' into 'master'
Fix ux issue with "This issue will be closed automatically" message

1. Make a nice box for "issue will be closed automatically" message
2. move it below emoji navbar. Otherwise looks wierd. 

Fixes #4134 

# Before
![Screenshot_2015-12-17_00.01.03](/uploads/2a24de77f76ce8a8b61ebabd3a02c83a/Screenshot_2015-12-17_00.01.03.png)

# After

![Screenshot_2015-12-17_00.03.08](/uploads/ccd21b87b7509e79773fabd179bef4aa/Screenshot_2015-12-17_00.03.08.png)


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

See merge request !2129
2015-12-17 09:09:44 +00:00
Achilleas Pipinellis be52c5d2a3 Merge branch 'doc_private_registry' into 'master'
Add info on using private Docker registries in CI



See merge request !2130
2015-12-17 07:29:18 +00:00
Achilleas Pipinellis 8579fea2cf Add info on using private Docker registries in CI [ci skip] 2015-12-17 08:53:00 +02:00
Rubén Dávila a4e0c7c7d6 Upgrade Poltergeist to 1.8.1. #4131 2015-12-17 01:01:08 -05: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
Robert Speicher bfb31a2aff Merge branch 'master' into 8-3-stable 2015-12-16 17:55:50 -05:00
Dmitriy Zaporozhets 9ede66f619 Merge branch 'api-support-starred-projects' into 'master'
Api support for requesting starred projects for user

Closes #4112

Note: probably targets the wrong release in the `CHANGELOG`, though 8.4 was not there yet

See merge request !2127
2015-12-16 22:49:28 +00: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
Robert Speicher 2683280e90 Merge branch 'fix-merge-immediately-button' into 'master'
Fix updating and disabling merge button when Merge Immediately is clicked

Fixes #4128

See merge request !2124
2015-12-16 21:32:13 +00:00
Robert Speicher 528145624c Merge branch 'fix_rubocop' into 'master'
Fix Rubocop complain.

See merge request !2125
2015-12-16 21:23:23 +00:00
Douwe Maan 6493fd3d58 Move MR Builds tab next to Commits 2015-12-16 22:18:19 +01:00
Zeger-Jan van de Weg c36821df9f Api support for requesting starred projects for user
Fixes #4112
2015-12-16 21:46:00 +01:00
Rubén Dávila 40c0b4b22a Fix Rubocop complain. 2015-12-16 14:51:25 -05:00
Achilleas Pipinellis a9f7df56ba Merge branch 'yaml-ci-cleanup' into 'master'
Clean up ci yaml doc

* Fix headings so that they are picked up by doc.gitlab.com
* Stick to 80 characters
* Clean up some examples

See merge request !2052
2015-12-16 19:50:21 +00:00
Robert Speicher b6edaeba1f Merge branch 'master' into 8-3-stable 2015-12-16 14:00:09 -05: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 76642d7a80 Merge branch 'feature/remove-celluloid' into 'master'
Update rerun to remove celluloid as dependency

After sidekiq 4 migration, we no longer need celluloid. `rerun` recent version also removed it from its dependency, so by getting this MR merged, we can solve #3797 

See merge request !2088
2015-12-16 18:24:25 +00:00
Dmitriy Zaporozhets 7070942521 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-12-16 19:19:25 +01:00
Dmitriy Zaporozhets 664384e78b Merge remote-tracking branch 'origin/rs-simplify-status-icon'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-16 19:19:07 +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 d89216ee3a Merge branch 'disable-markdown-cache' into 'master'
Temporarily disable Markdown caching



See merge request !2120
2015-12-16 18:06:01 +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
Robert Speicher e27db8694c Merge branch 'reference-cache' into 'master'
Only cache markdown when object has been saved and has a proper cache_key.

See merge request !2119
2015-12-16 17:58:14 +00:00
Robert Speicher b5230bbe7c Merge branch 'fix-merge-immediately' into 'master'
Fix 'Merge Immediately' button

Fixes #4125

See merge request !2117
2015-12-16 17:51:25 +00:00
Douwe Maan d337d5e713 Temporarily disable Markdown caching 2015-12-16 18:50:06 +01:00
Douwe Maan 6ea26ae623 Only cache markdown when object has been saved and has a proper cache_key. 2015-12-16 18:36:14 +01:00
Achilleas Pipinellis fc9fbdce44 Clean up ci yaml doc [ci skip]
* Fix headings so that they are picked up by doc.gitlab.com
* Stick to 80 characters
* Clean up some examples
2015-12-16 19:13:04 +02:00
Douwe Maan 4dfd4e0366 Merge branch 'fix-bad-merge' into 'master'
Fix bad merge

/cc: @dzaporozhets 

See merge request !2116
2015-12-16 16:48:30 +00:00
Douwe Maan 9908da17c1 Merge branch 'fix-endpoint-not-setting-var' into 'master'
Fix endpoint not setting needed @ci_commit

/cc @DouweM

See merge request !2112
2015-12-16 16:39:35 +00:00
Douwe Maan 5843d09f07 Fix 'Merge Immediately' button 2015-12-16 17:38:58 +01:00
Dmitriy Zaporozhets 747f0a328c Merge branch 'control-list-right-margin' into 'master'
Fix right margin of control list

Before:

![Screen_Shot_2015-12-16_at_16.29.39](/uploads/7a6aa79b6af0900d9257ce86ab822a22/Screen_Shot_2015-12-16_at_16.29.39.png)

After:

![Screen_Shot_2015-12-16_at_16.29.45](/uploads/d52fdc70ecd63fc61ae6ae87b3b7d1a5/Screen_Shot_2015-12-16_at_16.29.45.png)


See merge request !2114
2015-12-16 16:07:06 +00:00
Douwe Maan 18e1929ff8 Fix spec 2015-12-16 17:07:02 +01:00
Stan Hu 02f5673171 Fix bad merge 2015-12-16 08:02:28 -08: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
Dmitriy Zaporozhets fa4545e3f9 Merge branch 'fix-border' into 'master'
Fix double right border in MR discussion

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

# Before
![Screenshot_2015-12-16_15.44.00](/uploads/dd2c85e82fdb784e897cf1a695af1a1e/Screenshot_2015-12-16_15.44.00.png)

# After
![Screenshot_2015-12-16_15.43.36](/uploads/b50954e01bb3f45d2df6f43d34a1db60/Screenshot_2015-12-16_15.43.36.png)

cc @skyruler 

See merge request !2113
2015-12-16 15:46:18 +00:00
Douwe Maan d8978acd39 Fix right margin of control list 2015-12-16 16:30:01 +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