Commit Graph
21755 Commits
Author SHA1 Message Date
Robert Speicher f4c05ee45f Merge branch 'admin_add_identity' into 'master'
Allow admin to create new user identities

Fixes #2442 

See merge request !2077
2015-12-21 17:58:20 +00:00
Robert Speicher 12b6bf5c57 Merge branch 'fix-issue-related-mrs' into 'master'
Fix issue related cross-project MRs

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4188

See merge request !2163
2015-12-21 17:54:45 +00:00
Robert Speicher 9570495e75 Merge branch 'add_email_unlock' into 'master'
Allow account unlock via email

We see a lot of users get confused about what it means when your account gets
locked. Many try to reset their password and are still faced with a lockout.
With this change, users receive an email that allows them to unlock their
account immediately. The previous behavior where the account is auto-unlocked
after a time also still works.

See merge request !2049
2015-12-21 17:53:20 +00:00
Douwe Maan 17ed42e362 Merge branch 'issue_3452' 2015-12-21 17:43:58 +01:00
Douwe Maan c43fbaab93 Add changelog item 2015-12-21 17:43:43 +01:00
Douwe Maan 1be8a3e087 Move changelog item 2015-12-21 17:39:31 +01:00
Douwe Maan 9832e60ffb Merge branch 'tduehr/gitlab-ce-cas-support' 2015-12-21 17:38:37 +01:00
Douwe Maan 7fc2422c8d Add link to CAS doc 2015-12-21 17:37:55 +01:00
Douwe Maan e209ba7002 Merge branch 'git-version' into 'master'
Show git version on admin page

Before
![git-version-beore](/uploads/57444ad42220c9dfe8f187b8e399227f/git-version-beore.png)

After
![git-version-after](/uploads/cc1b52ae1a251c2c46d9626c040726ab/git-version-after.png)

gitlab-org/gitlab-ce#4077




See merge request !2101
2015-12-21 16:33:18 +00:00
Douwe Maan 058f27ad2a Merge branch 'coverage-regex' into 'master'
Fix build coverage regex matching to allow captures.

Fixes #2644 

/cc @DouweM 

See merge request !2138
2015-12-21 16:25:09 +00:00
Dmitriy Zaporozhets 545a943468 Merge branch 'backport_jira' into 'master'
Backport JIRA service

Fixes #3839 

Move EE JIRA functionality back to CE.

- [x] Make it function in manual testing
- [x] Migrate JIRA-specific tests
- [x] Tests pass
- [x] Migrate documentation
- [x] Rollback to previous CE JIRA integration locally, activate on a project then try to migrate db and see if integration still works.
- [x] Final EE search for JIRA references

See merge request !2146
2015-12-21 14:47:27 +00:00
Douwe Maan 5ef2048f65 Fix issue related cross-project MRs 2015-12-21 15:36:08 +01:00
Jared Szechy 5a3237fd8d Fix build coverage regex.
Added a spec for regex captures as well.

Fixes #2644
2015-12-20 13:18:14 -05:00
Achilleas Pipinellis 4b4cbf0ce4 Merge branch 'removeNonDefinedVariableFromCIDoc' into 'master'
Remove CI_BUILD_BEFORE_SHA from CI documentation

As pointed in #3210, the environment variable isn't usable any more.

See merge request !2118
2015-12-19 08:46:38 +00:00
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
Drew Blessing f177aaa5fa Backport JIRA service 2015-12-18 14:19:48 -06: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
Jared Szechy 05e0b6d014 Fix build coverage regex matching to allow captures.
Fixes #2644
2015-12-17 09:59:14 -05: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