Commit Graph
21731 Commits
Author SHA1 Message Date
Achilleas Pipinellis 3ee33b54bf Merge branch 'update_artifact_runner_docs' into 'master'
Clarify Windows shell executor artifact upload support

@ayufan noted that the runner does not support artifact upload for Windows shell executor. This adds a note so users aren't confused.

See merge request !2142
2015-12-19 08:37:34 +00:00
Grzegorz Bizon 27859f7ed9 Merge branch 'ci-commit-status-skipped' into 'master'
Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if the builds are enabled

Fixes #3827 
Fixes #4157

/cc @grzesiek @dblessing 

See merge request !2139
2015-12-18 18:48:06 +00:00
Robert Speicher 3ca78f015a Merge branch 'reference_clean_up' into 'master'
Do not display project group/name when issue and MR are in same project

I noticed that things seem a bit cluttered for related merge requests
when displaying the group/project name for every item, even when it's
in the same project.

For merge requests that are in the same project as the issue we probably
don't need to display the 'in group / name' bit.

See merge request !2141
2015-12-18 18:36:34 +00:00
Robert Speicher 22e65944ee Merge branch 'update-rack-attack-security' into 'master'
Bump Rack Attack to v4.3.1 for security fix

https://github.com/kickstarter/rack-attack/releases/tag/v4.3.1

See merge request !2153
2015-12-18 18:13:42 +00:00
Stan Hu f33cb184f9 Bump Rack Attack to v4.3.1 for security fix
https://github.com/kickstarter/rack-attack/releases/tag/v4.3.1
2015-12-18 10:10:02 -08:00
Robert Speicher 3f26d24f52 Merge branch 'remove-extra-spaces' into 'master'
Remove extra spaces after branchname

See merge request !2152
2015-12-18 18:00:25 +00:00
Grzegorz Bizon a54bd0ff77 Merge branch 'fix/mr-reopen-button-title' into 'master'
Fix merge-request-reopen button title

Closes #4069

See merge request !2147
2015-12-18 16:03:39 +00:00
Dmitriy Zaporozhets 08ddb8f768 Merge branch 'create_menu_additions' into 'master'
Add new branch and tag action to tree dropdown

Right now, creating a branch or tag is only possible on the project page dropdown or on the commits page. This merge request both actions to the tree header dropdown. Now all repository web actions are available in this one location, plus the existing ones. It makes the operations a lot more intuitive.

## Existing Tree/Repository dropdown:

![Screen_Shot_2015-12-17_at_2.38.50_PM](/uploads/4d83a4b518093ea85f0859b385abcc7c/Screen_Shot_2015-12-17_at_2.38.50_PM.png)

## New Tree/Repository dropdown:

![Screen_Shot_2015-12-17_at_2.32.28_PM](/uploads/1fc18a511774630c5078a7d5c0fbb5b6/Screen_Shot_2015-12-17_at_2.32.28_PM.png)'

See merge request !2144
2015-12-18 13:08:29 +00:00
Douwe Maan 9b9cf3bced Merge branch 'remove-duplicate-changelog-entry' into 'master'
Remove duplicate entry in the changelog

/cc @DouweM 

See merge request !2149
2015-12-18 10:20:00 +00:00
Zeger-Jan van de Weg b982caf115 Remove duplicate entry in the changelog 2015-12-18 11:16:59 +01:00
Zeger-Jan van de Weg ffa12a7f82 Remove extra spaces after branchname 2015-12-18 11:16:08 +01:00
Grzegorz Bizon 50798a90b6 Fix merge-request-reopen button title
Closes #4069
2015-12-18 09:12:44 +01:00
Robert Speicher 3b303febd0 Merge branch 'gitlab-shell-2.6.9' into 'master'
Use gitlab-shell 2.6.9

See merge request !2143
2015-12-17 21:36:33 +00:00
Drew Blessing 50ef67617c Add branch and tag operation to tree dropdown 2015-12-17 14:50:00 -06:00
Jacob Vosmaer 56d780cf2c Use gitlab-shell 2.6.9 2015-12-17 20:54:27 +01:00
Drew Blessing c019154a91 Clarify Windows shell executor artifact upload support 2015-12-17 13:01:57 -06:00
Kamil Trzcinski 742089ae04 Fix feature specs: we always show the build status if ci_commit is present 2015-12-17 17:51:22 +01:00
Drew Blessing 84caae7294 Do not display project group/name when issue and MR are in same project 2015-12-17 10:14:50 -06:00
Kamil Trzcinski 58a56a0396 Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if the builds are enabled 2015-12-17 16:33:47 +01: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
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
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