Commit Graph
27777 Commits
Author SHA1 Message Date
Rémy Coutable 2cf8564cfe Merge branch 'new-badge-url' into 'master'
Use new build badge URLs

Use new build badge URLs to follow the instruction at [the project badges](https://gitlab.com/gitlab-org/gitlab-ce/badges).

See merge request !4037
2016-05-05 02:25:25 +00:00
Stan Hu bee002270d Merge branch 'fix-team-build-state-in-mr-widget' into 'master'
Merge request widget displays TeamCity build state and code coverage correctly again

## What does this MR do?
This MR contains a fix for a regression introduced in `8.7`. In former version, the TeamCity build status was always displayed correctly. In `8.7` the build state is still checked, but the UI is not updated correctly any longer.

## Are there points in the code the reviewer needs to double check?
The changes are quite simple, so please simply double check them.

## Why was this MR needed?
This MR is needed to make the TeamCity build status working again.

## What are the relevant issue numbers?
#17080 

See merge request !3998
2016-05-04 23:47:36 +00:00
Stan Hu 5653a71635 Merge branch 'rs-repository-size-format' into 'master'
Use `number_to_human_size` helper to show repository size

This will intelligently format large repository sizes in GBs (or,
shudder, TBs).

Also, removes `rescue` clause from `repository_size` helper.
The repository size has since become calculated (and cached)
more intelligently, and this should no longer be necessary.

See merge request !4047
2016-05-04 22:54:25 +00:00
Benedikt Huss 0e9c2e721b Feedback from stanhu 2016-05-05 00:18:36 +02:00
Robert Speicher 5448970950 Remove rescue clause from repository_size helper
The repository size has since become calculated (and cached) more
intelligently, and this should no longer be necessary.
2016-05-04 18:14:03 -04:00
Robert Speicher 92c25f4200 Use number_to_human_size helper to show repository size
This will intelligently format large repository sizes in GBs (or,
shudder, TBs).
2016-05-04 18:13:33 -04:00
Benedikt Huss 655b2640ae Merge request widget displays TeamCity build state and code coverage correctly again 2016-05-05 00:07:56 +02:00
Robert Speicher 915a4193b4 Merge branch 'sanitize-new-project-error-message' into 'master'
Sanitize repo paths in new project error message

Closes #17243

See merge request !4029
2016-05-04 22:03:18 +00:00
Stan Hu 75523d1df9 Sanitize repo paths in new project error message
Closes #17243
2016-05-04 14:06:07 -07:00
Jacob Schatz 950ab1e847 Merge branch '17000-comment-links' into 'master'
Remove break-all from links

Closes #17000

See merge request !4042
2016-05-04 20:59:27 +00:00
Jacob Schatz 7ed3a6944f Merge branch 'fix-files-page-colors' into 'master'
Fix file list page border colors



See merge request !4008
2016-05-04 20:57:38 +00:00
Jacob Schatz 2b4e8d933c Merge branch 'improve-milestone-ui' into 'master'
Improve milestone page UI

* remove button after edit button
* use hex value for text color
* re-use existing text color variables

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

See merge request !4014
2016-05-04 20:56:13 +00:00
Yorick Peterse fad7b392dc Merge branch 'invalid-exists-on-new-push' into 'master'
Expire repository exists? and has_visible_content? caches after a push if necessary

See merge request !3975
2016-05-04 20:31:11 +00:00
Annabel Dunstone 6b4e255aa8 Remove break-all from links 2016-05-04 15:00:33 -05:00
Stan Hu 525e05b653 Expire repository exists? and has_visible_content? caches after a push if necessary
Closes #17012
2016-05-04 11:59:12 -07:00
Jacob Schatz 8be1118aa5 Merge branch 'clean-user-profile-classes' into 'master'
Remove unused .contributed-projects class

While working on #13401 and trying to add a new tab to the user profile
page, I came across this. I noticed that the `contributed-projects`
class was only being used in order to select the div in the tests. For
consistency with the other tabs, I decided to remove this class and use
the div's id for the selector.

See merge request !3945
2016-05-04 18:34:34 +00:00
Robert Speicher 8aa29a5d73 Merge branch 'limit-mr-seedfu' into 'master'
Limit the number of merge requests per project to avoid long seeds in development environment

This step was taking a long time because seed_fu creates N / 2 merge requests for each repo, where N is the number of branches for that repo. At the time of this writing, there are 234 branches on the gitlab-ce repo, leading to 117 merge requests.

See merge request !4032
2016-05-04 17:56:57 +00:00
Rémy Coutable 585f5cfa33 Merge branch 'gravatar-fix' into 'master'
Use the new admin settings for gravatar

Fixes gitlab-org/gitlab-ce#14826

See merge request !3988
2016-05-04 17:38:55 +00:00
Jacob Schatz 53c46a22dc Merge branch 'compact-files-list' into 'master'
Make files list more compact by reducing row height from 47px to 44px

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

cc @jschatz1 @skyruler 

See merge request !4007
2016-05-04 17:19:15 +00:00
Rémy Coutable ec7dee4f63 Merge branch 'gitlab-ci-ssh-keys-doc-fix' into 'master'
Documentation fix in CI SSH keys setup

In recent versions of Docker, the `/.dockerinit` file doesn't exist any more when running inside a container. That file is used in the example here to detect whether the runner is running inside Docker or not. Change it to check for the existence of `/.dockerenv`, which does exist in all current versions of Docker.

See merge request !3938
2016-05-04 16:46:57 +00:00
Douwe Maan b403d40fdb Merge branch 'exec-in-launch-wrappers' into 'master'
Use 'exec' in Unicorn and Sidekiq launch scripts

When running Unicorn or Sidekiq in the foreground this change removes
an intermediate /bin/sh process. This makes process supervision in the
GitLab Development Kit more reliable.

This change does not affect Omnibus-GitLab (because there we do not
use these launch scripts). Installations from source do use the launch
scripts but for the standard GitLab init script this change will not
make a difference.

Custom installations using Upstart or Systemd may be affected however,
because under certain configurations these systems count exactly how
many forks happen during process startup, and we are reducing that
number by one here.

Closes https://gitlab.com/gitlab-org/gitlab-development-kit/issues/116

See merge request !3964
2016-05-04 16:22:58 +00:00
Stan Hu b9672d4b38 Limit the number of merge requests per project to avoid long seeds
This step was taking a long time because seed_fu creates N / 2 merge requests
for each repo, where N is the number of branches for that repo. At the time of
this writing, there are 234 branches on the gitlab-ce repo, leading to 117
merge requests.
2016-05-04 09:22:01 -07:00
Rémy Coutable 1a9d505972 Merge branch 'use-rugged-to-create-tag' into 'master'
Use Rugged's TagCollection#create instead of gitlab-shell's Repository#add_tag for better performance

This was originally opened at !1757 by @pcarranza but I changed it to use Rugged instead of gitlab_git, following @DouweM's request.

Once this is merged, https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/26 will be mergeable too.

See merge request !3745
2016-05-04 16:07:13 +00:00
Rémy Coutable c2c70cfcb3 Merge branch 'fix-typo-in-user-steps' into 'master'
Fix typo in user steps feature file

Just came across a typo in the user steps file.

See merge request !3943
2016-05-04 15:58:24 +00:00
Rémy Coutable 66d8ef1ad9 Merge branch 'doc-fix-db-gem-install-instructions' into 'master'
Update patch_versions.md with explicit --with statement for db gem group

## What does this MR do?
Updates `patch_versions.md`'s instructions on installing gems to explicitly install either the postgres or mysql groups.

## Are there points in the code the reviewer needs to double check?
No, but thank you for your time.

## Why was this MR needed?
I performed the steps listed in `patch_versions.md` and ran the command for updating postgres gems. Bundler told me at the end that it had not installed the postgres gem group, which caused the next step, migrating the DB, to fail for obvious reasons.

Changing the command to `--with postgres` made it install the postgres gem group, and db:migrate then passed.

## What are the relevant issue numbers?
None

## Screenshots (if relevant)
N/A

See merge request !3955
2016-05-04 15:56:01 +00:00
Artem Sidorenko fb5682e7cd Use the new admin settings for gravatar 2016-05-04 17:45:29 +02:00
Douwe Maan 6a8359f3d3 Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits'
# Conflicts:
#	Gemfile.lock
2016-05-04 17:27:47 +02:00
Rémy Coutable 209f2f1e6f Use a similar approach to branch creation for tag creation
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-04 17:19:13 +02:00
Rémy Coutable 44f89eafc0 Use Rugged's TagCollection#create instead of gitlab-shell's Repository#add_tag for better performance
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-04 17:19:13 +02:00
Douwe Maan 72e4bd5fc4 Merge branch 'feature-proposal-contribution-guidelines' into 'master'
feature proposal issue template in contributing guide

This adds a feature proposal template to the contribution guidelines for internal and external use.

Fixes #15448 

cc @markpundsack @stanhu @dzaporozhets 

See merge request !3967
2016-05-04 14:46:24 +00:00
Rémy Coutable 836eb04b1a Merge branch 'lstrip-cop' into 'master'
Enable LstripRstrip cop

This requires no code changes since it doesn't actually change anything in the codebase, just preventative.

See merge request !3959
2016-05-04 14:41:00 +00:00
Yorick Peterse 917c26ced7 Merge branch 'add-instrumentation-for-15137' into 'master'
Instrument methods used in email diffs

See merge request !4038
2016-05-04 14:25:28 +00:00
Rémy Coutable b9d9a4d213 Merge branch 'remove-unnecessary-method-call-in-events-view' into 'master'
Remove unnecessary method call in events view

Since `User#to_param` already returns `User#username`, we don't need to
pass in the user's username. Changing this also helps us obey LoD.

See merge request !3996
2016-05-04 14:12:51 +00:00
Douwe Maan 466f6874af Merge branch 'create-wikis-during-check' into 'master'
Initialize wikis on legacy projects during check

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

Helps https://gitlab.com/gitlab-org/gitlab-ce/issues/15423

See merge request !3931
2016-05-04 14:10:49 +00:00
Rémy Coutable 275c615557 Merge branch 'revert-devise-async' into 'master'
Revert "Remove the Devise Async gem."

This reverts commit 1cc614f2bd.

It was causing the ActiveJob integration to fail, so unfortunately we'll have to add the gem again.

Resolves #17250.

See merge request !4027
2016-05-04 13:55:00 +00:00
Douwe Maan 622ad2355a Merge branch 'rs-unique-signup-fields' into 'master'
Improve uniqueness of field names on the signup form

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

See merge request !3826
2016-05-04 13:33:15 +00:00
Sean McGivern f660b2173e Instrument methods used in email diffs
Make all of the nested constant instrumentation for core app code work
the same way, add mailer instrumentation, and add instrumentation to the
premailer gem.
2016-05-04 14:20:48 +01:00
Takuya Noguchi 9bd5ac50b4 Use new build badge URLs 2016-05-04 21:33:55 +09:00
Yorick Peterse a4df822b2e Merge branch 'fix-performance-links' into 'master'
Fixed username links in the performance guide

See merge request !4036
2016-05-04 11:19:33 +00:00
Yorick Peterse 70551217a6 Fixed username links in the performance guide
These would end up being rendered as:

    <a href="...">@yorickpeterse</a>
    <a href="...">@yorickpeterse</a>

[ci skip]
2016-05-04 13:17:43 +02:00
Rémy Coutable 0067ca5b87 Merge branch 'fix-master-spec' into 'master'
Fix a spec that was failing due to !3483

Spec were skipped in this MR so that tests started to fail in master
instead of in this MR!

/cc @connorshea @rspeicher 

See merge request !4033
2016-05-04 10:58:22 +00:00
Rémy Coutable 5f89c9642e Fix a spec that was failing due to !3483
Spec were skipped in this MR so that tests started to fail in master
instead of in this MR!

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-04 12:17:12 +02:00
Achilleas Pipinellis 450ea01d31 Merge branch 'patch-1' into 'master'
Made it clearer that issue_id means iid, not id.



See merge request !4030
2016-05-04 09:33:38 +00:00
Aral Balkan 82b5bb9117 Made it clearer that issue_id means iid, not id. 2016-05-04 06:58:40 +00:00
Robert Speicher 351df5a90c Merge branch 'signout-rel-url' into 'master'
Use sign out path only if not empty

Fixes: https://github.com/gitlabhq/gitlabhq/issues/10066

See merge request !3989
2016-05-04 01:26:26 +00:00
Robert Speicher d446c9db51 Merge branch 'upgrade-rspec-rails' into 'master'
Update rspec-rails from 3.3.3 to 3.4.2.

This allows the removal of the monkey patch from this commit: 47ff1c5608

It'll also make it slightly easier to upgrade to 3.5.0 later.

Changelog: https://github.com/rspec/rspec-rails/blob/master/Changelog.md#340--2015-11-11

See merge request !3999
2016-05-03 22:19:18 +00:00
Robert Speicher 3e43214ff6 Merge branch 'link-to-code-review-guide' into 'master'
Link to GitLab code review guide in contributing guidelines

I noticed that the contributing guidelines still link to the thoughtbot
code review guidelines even though we already have our own.

[ci skip]

See merge request !4018
2016-05-03 22:05:32 +00:00
Connor Shea 3004386b55 Revert "Remove the Devise Async gem."
This reverts commit 1cc614f2bd.

It was causing the ActiveJob integration to fail, so unfortunately we'll have to add the gem again.
2016-05-03 15:43:51 -06:00
Artem Sidorenko d6c2d6bab9 Use sign out path only if not empty 2016-05-03 22:10:49 +02:00
Robert Speicher f5d6a86f38 Merge branch 'improve-2fa-note' into 'master'
Improve the Two-factor Authentication sign-in text [ci skip]

Resolves #14543.

See merge request !3483
2016-05-03 19:57:46 +00:00