Commit Graph
26705 Commits
Author SHA1 Message Date
Jacob Schatz e17f79fdfa Merge branch 'issuable-form-alignment' into 'master'
Fixed alignment on issuable new form

Fixes #13802

![Screen_Shot_2016-04-11_at_17.03.29](/uploads/d359580e693284d4b694d8158d4f736e/Screen_Shot_2016-04-11_at_17.03.29.png)

See merge request !3661
2016-04-13 16:24:48 +00:00
Achilleas Pipinellis 59bfc0fb59 Merge branch 'update-influx-documentation' into 'master'
Updated InfluxDB/Grafana setup/import docs

See https://gitlab.com/gitlab-org/grafana-dashboards/merge_requests/1 for some background info.

cc @dblessing 

See merge request !3706
2016-04-13 16:23:50 +00:00
Robert Speicher 2b28fa14b3 Merge branch 'redis_improvements' into 'master'
Clean up ExclusiveLease

See merge request !3695
2016-04-13 16:22:45 +00:00
Robert Speicher 0b447a9977 Merge branch 'fix-trailing-slash-in-bamboo_url' into 'master'
Fix a bug with trailing slash in bamboo_url

Also, improve specs for BambooService

Similar to !3679.

See merge request !3680
2016-04-13 16:18:46 +00:00
Robert Speicher 6020602359 Merge branch 'fix-trailing-slash-in-teamcity_url-3515' into 'master'
Fix trailing slash in teamcity_url

Originally opened at !2309 by @ctmay4.

As described in #3515, if you have trailing spaces in the the Teamcity server name, the service
will not work properly.  Switching from `URI.parse` to `URI.join` fixes it so that it works with
or without a trailing slash.

Fixes #3515.

See merge request !3679
2016-04-13 16:17:39 +00:00
Rémy Coutable c414e4342b Merge branch 'async-related-mrs' into 'master'
Load related MRs/branches asynchronously

cc @dzaporozhets 

See merge request !3678
2016-04-13 16:06:36 +00:00
Jacob Schatz 0e7968d0a1 Merge branch 'make_milestone_labels_tab_similar_to_labels_page' into 'master'
Make milestone labels in labels tab similar to that of the labels page

I realized that some of the changes for the labels page was not reflecting in the labels list in milestone page.

## Desktop
![Screen_Shot_2016-04-11_at_4.25.36_PM](/uploads/e21f3c5a9187fe32472e796171781b5d/Screen_Shot_2016-04-11_at_4.25.36_PM.png)

## Mobile
![Screen_Shot_2016-04-11_at_4.26.47_PM](/uploads/5c9f75ca0938fc30ab47c5520215f692/Screen_Shot_2016-04-11_at_4.26.47_PM.png)


See merge request !3658
2016-04-13 16:02:20 +00:00
Rémy Coutable c8560894f7 Merge branch 'api-subscribe-issue-mr' into 'master'
API: Subscribe and unsubscribe from issues and merge requests

* Closes #6024 

This MR is based on !3611, which must be merged first.


See merge request !3615
2016-04-13 15:54:31 +00:00
Yorick Peterse 0a37976a4d Updated InfluxDB/Grafana setup/import docs
The grafana-dashboards repository now contains _all_ GitLab.com
dashboards and thus requires some extra continuous queries to be set up.
The repository now also provided a way to automatically import/export
dashboards.

[ci skip]
2016-04-13 17:29:04 +02:00
Kamil Trzciński 3463ffde9e Merge branch 'push-ref' into 'master'
Fix high CPU usage when PostReceive receives refs/merge-requests/<id>

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


See merge request !3651
2016-04-13 15:27:13 +00:00
Yorick Peterse 31e28ebceb Load related MRs/branches asynchronously
Currently this works by loading the HAML partials via XHR. While this is
not the nicest setup it _is_ the easiest setup using the tools we
currently have.

Loading this data asynchronously doesn't make loading the related
MRs/branches itself faster, it merely ensures that loading the issue
itself is not slowed down.

Fixes gitlab-org/gitlab-ce#14949
2016-04-13 17:24:21 +02:00
Robert Schilling a9200d93d3 Ensure that issues and merge requests are found 2016-04-13 17:15:42 +02:00
Rémy Coutable 94e130cec3 Merge branch 'api-star-project' into 'master'
API: Star and unstar a project

Add two new endpoints `POST /projects/:id/star` and `POST /projects/:id/unstar` to star and unstar a project.

* Closes #12739


See merge request !3578
2016-04-13 15:05:21 +00:00
Jacob Schatz eebd7533ea Merge branch 'fix-bug-causing-comment-to-submit-twice' into 'master'
Fix bug causing comment form in issue to submit twice when CTRL+Enter is pressed twice



See merge request !3655
2016-04-13 15:04:09 +00:00
Robert Speicher 34d7619a1c Merge branch 'carousel-remove' into 'master'
Remove Bootstrap Carousel

The Bootstrap carousel module is used for image carousels, and we don't
use it anywhere on the site.

Fixes #14670.

See merge request !3624
2016-04-13 14:51:51 +00:00
Kamil Trzcinski af25001d46 Merge branch 'master' into push-ref 2016-04-13 16:40:59 +02:00
Rémy Coutable e359f870f2 Merge branch 'instrument-house-keeping' into 'master'
Instrument the HousekeepingService class

I'm starting with instrumenting this class as mentioned in https://gitlab.com/gitlab-org/gitlab-ce/issues/15094#note_4796278.

See merge request !3701
2016-04-13 14:28:19 +00:00
Achilleas Pipinellis dabedd1d8c Merge branch 'fix_grafana_docs' into 'master'
Fix Grafana docs and link from Influx page

Fixing images and adding links to Influx docs, as suggested by @sytses 

See merge request !3702
2016-04-13 14:26:35 +00:00
Robert Schilling 54231aa4e0 Styling changes to code and docs 2016-04-13 16:25:24 +02:00
Rémy Coutable acf911eeae Fix a bug with trailing slash in bamboo_url
Also, improve specs for BambooService

Similar to https://gitlab.com/gitlab-org/gitlab-ce/issues/3515

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-13 15:58:14 +02:00
Yorick Peterse 3b9edce803 Instrument the HousekeepingService class
This allows us to track how much time is spent in updating the
"pushes_since_gc" column as well as the time needed to obtain the lease.
2016-04-13 15:31:13 +02:00
Jacob Schatz f026e53c4d Merge branch 'label-filter' into 'master'
Fixed not being able to filter by any or no labels

Brings back the options to filter by any or no label

Closes #15008 

![Screen_Shot_2016-04-07_at_11.26.41](/uploads/20d949b19f537d830118532e1d44feb7/Screen_Shot_2016-04-07_at_11.26.41.png)

See merge request !3589
2016-04-13 13:24:44 +00:00
Marin Jankovski c746046992 Merge branch 'external-omniauth-providers' into 'master'
Allow Omniauth providers to be marked as external

Related to #4009 

With this MR we will be able to allow the user to set which Omniauth Providers they would like to have as external. All users login in via these providers will be marked as external, even if they already had an account before. If the provider is removed form the list of external providers, the users will be marked as internal at their next login.

MR for Omnibus: gitlab-org/omnibus-gitlab!727

/cc @dblessing @DouweM 

See merge request !3657
2016-04-13 13:09:47 +00:00
Dmitriy Zaporozhets ab4ea3720c Merge branch 'rs-archive-cache-worker-cron' into 'master'
Move RepositoryArchiveCacheWorker to sidekiq-cron

Closes #15105

See merge request !3663
2016-04-13 12:53:01 +00:00
Dmitriy Zaporozhets 87cd46c475 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2016-04-13 14:47:17 +02:00
Dmitriy Zaporozhets 59c735bd1e Merge branch 'rs-gitlab-com-check' into 'master'
Add `Gitlab.com?` method

To be used as a feature flag for GitLab.com-only features, such as
welcome emails.

We will be careful to only use this to disable features or functionality
that do not make sense for any installations that aren't GitLab.com. We
will not use this to restrict features from other installations or keep
them "exclusive" to GitLab.com.

See merge request !3682
2016-04-13 12:27:17 +00:00
Robert Schilling 3ab9ea8dae Make staring API more restful 2016-04-13 14:26:41 +02:00
Robert Schilling ea2193aaeb API: Star and unstar a project 2016-04-13 14:26:40 +02:00
Robert Schilling fa3009095f Make subscription API more RESTful 2016-04-13 13:52:13 +02:00
Achilleas Pipinellis 941cfd1fbd Merge pull request #10136 from samjwlee/master
(doc) fix typo to ssh keys doc url
2016-04-13 14:52:03 +03:00
Robert Schilling f875189b39 API: Ability to subscribe and unsubscribe from a merge request 2016-04-13 13:45:01 +02:00
Robert Schilling bd0be13f5b API: Ability to subscribe and unsubscribe from an issue 2016-04-13 13:45:00 +02:00
Rémy Coutable cf306b17bf Merge branch 'api-group-leaking' into 'master'
API: Return 404 if user does not have access to group

Closes #15185 

After !3587 is merged, I'll update this one to also fix the return code of the tests in !3587.

See merge request !3683
2016-04-13 11:32:25 +00:00
Rémy Coutable 861e685e18 Merge branch 'api-move-issues' into 'master'
API: Ability to move an issue

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

See merge request !3593
2016-04-13 10:55:12 +00:00
Robert Schilling 94c8fbc9fc Merge branch 'patch-2' into 'master'
improve formatting



See merge request !3688
2016-04-13 10:25:58 +00:00
Valery Sizov 33f786b5d3 clean up ExclusiveLease 2016-04-13 13:12:05 +03:00
Robert Schilling 4cd04443f5 Fix group_member_spec to not leak information 2016-04-13 12:10:12 +02:00
Robert Schilling fdbf368202 Fix doc for moving an issue 2016-04-13 12:03:05 +02:00
Rémy Coutable bbf49ffca1 Merge branch 'custom-transaction-tags' into 'master'
Added ability to add custom tags to transactions

cc @pcarranza 

See merge request !3674
2016-04-13 10:02:30 +00:00
Rémy Coutable e83424a13e Merge branch 'configure_trusted_proxies' into 'master'
Adjust the default trusted_proxies to only include localhost

And also allow other trusted proxies to be added from the config.yml.

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

Omnibus config: https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1208

See merge request !3524
2016-04-13 09:53:13 +00:00
Achilleas Pipinellis 5d14615a76 Merge branch 'jira_docs' into 'master'
Tie example config to JIRA screenshot

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

See merge request !3693
2016-04-13 09:32:52 +00:00
Robert Schilling 2b036025d6 Update tests for moving issues via API 2016-04-13 11:31:50 +02:00
Achilleas Pipinellis 244219376d Tie example config to JIRA screenshot
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15203
2016-04-13 12:28:07 +03:00
Robert Schilling 482f67edb4 API: Ability to move an issue 2016-04-13 11:23:42 +02:00
Yorick Peterse 3240ecfbef Added ability to add custom tags to transactions
One use case for this is manually setting the "action" tag for Grape API
calls. Due to Grape running blocks there are no human readable method
names that can be used for the "action" tag, thus we have to set these
manually on a case by case basis.
2016-04-13 11:22:37 +02:00
Robert Schilling ca40479c51 API: Avoid group leak while updating the group 2016-04-13 11:20:45 +02:00
Robert Schilling b2f48d8c46 API: Return 404 if user does not have access to group 2016-04-13 11:11:09 +02:00
Rémy Coutable 8ea6c6d80c Merge branch 'issue_15044' into 'master'
Allow to close invalid merge request

fixes #15044

See merge request !3664
2016-04-13 09:10:57 +00:00
Achilleas Pipinellis 6bb71869b8 Merge branch 'docs-new-branch-button-3886' into 'master'
Docs for the new branch button

[ci-skip]

Closes #3886 

@axil Could you check this and make sure this is up to your standards?



See merge request !3425
2016-04-13 09:02:14 +00:00
Yorick Peterse 57e660d8f3 Merge branch 'fix-stale-branch-count-cache' into 'master'
Fix repository cache invalidation issue when project is recreated with an empty repo

See merge request !3692
2016-04-13 08:37:51 +00:00