summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge branch 'redis_improvements' into 'master' Robert Speicher2016-04-131-5/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up ExclusiveLease See merge request !3695
| * | | | | | clean up ExclusiveLeaseredis_improvementsValery Sizov2016-04-131-5/+0
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'fix-trailing-slash-in-bamboo_url' into 'master' Robert Speicher2016-04-133-62/+221
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a bug with trailing slash in bamboo_url Also, improve specs for BambooService Similar to !3679. See merge request !3680
| * | | | | | Fix a bug with trailing slash in bamboo_urlRémy Coutable2016-04-133-62/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | Merge branch 'fix-trailing-slash-in-teamcity_url-3515' into 'master' Robert Speicher2016-04-133-66/+219
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Improve TeamcityService and its specsfix-trailing-slash-in-teamcity_url-3515Rémy Coutable2016-04-133-58/+203
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Fix a bug with trailing slash in teamcity_urlCharles May2016-04-122-13/+21
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/3515
* | | | | | | Merge branch 'async-related-mrs' into 'master' Rémy Coutable2016-04-136-15/+66
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load related MRs/branches asynchronously cc @dzaporozhets See merge request !3678
| * | | | | | | Load related MRs/branches asynchronouslyYorick Peterse2016-04-136-15/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge branch 'make_milestone_labels_tab_similar_to_labels_page' into 'master' Jacob Schatz2016-04-132-13/+25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | make milestone labels in labels tab similar to that of the labels pagemake_milestone_labels_tab_similar_to_labels_pageArinde Eniola2016-04-112-13/+25
| | | | | | | | |
* | | | | | | | | Merge branch 'api-subscribe-issue-mr' into 'master' Rémy Coutable2016-04-137-0/+415
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | Ensure that issues and merge requests are foundRobert Schilling2016-04-134-7/+20
| | | | | | | | | |
| * | | | | | | | | Make subscription API more RESTfulRobert Schilling2016-04-137-72/+68
| | | | | | | | | |
| * | | | | | | | | API: Ability to subscribe and unsubscribe from a merge requestRobert Schilling2016-04-135-3/+216
| | | | | | | | | |
| * | | | | | | | | API: Ability to subscribe and unsubscribe from an issueRobert Schilling2016-04-135-0/+197
| | | | | | | | | |
* | | | | | | | | | Merge branch 'push-ref' into 'master' Kamil Trzciński2016-04-133-5/+41
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | Merge branch 'master' into push-refKamil Trzcinski2016-04-13193-839/+5058
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix high CPU usage when PostReceive receives refs/merge-requests/<id>push-refKamil Trzcinski2016-04-113-5/+41
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'api-star-project' into 'master' Rémy Coutable2016-04-136-0/+214
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | Styling changes to code and docsRobert Schilling2016-04-134-9/+8
| | | | | | | | | | | |
| * | | | | | | | | | | Make staring API more restfulRobert Schilling2016-04-133-16/+15
| | | | | | | | | | | |
| * | | | | | | | | | | API: Star and unstar a projectRobert Schilling2016-04-136-0/+216
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'fix-bug-causing-comment-to-submit-twice' into 'master' Jacob Schatz2016-04-131-1/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug causing comment form in issue to submit twice when CTRL+Enter is pressed twice See merge request !3655
| * | | | | | | | | | | fix bug causing comment form in issue to submit twice when CTRL+Enter is ↵fix-bug-causing-comment-to-submit-twiceArinde Eniola2016-04-111-1/+5
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pressed twice
* | | | | | | | | | | Merge branch 'carousel-remove' into 'master' Robert Speicher2016-04-132-2/+11
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | Remove Bootstrap Carouselconnorshea2016-04-122-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Bootstrap carousel module is used for image carousels, and we don't use it anywhere on the site. Also separated the Bootstrap JavaScript into separate components and removed the carousel component. Fixes #14670.
* | | | | | | | | | | | Merge branch 'instrument-house-keeping' into 'master' Rémy Coutable2016-04-132-4/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | Instrument the HousekeepingService classinstrument-house-keepingYorick Peterse2016-04-132-4/+11
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | | Merge branch 'fix_grafana_docs' into 'master' Achilleas Pipinellis2016-04-134-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Grafana docs and link from Influx page Fixing images and adding links to Influx docs, as suggested by @sytses See merge request !3702
| * | | | | | | | | | | Fix Grafana docs and link from Influx pageDrew Blessing2016-04-124-3/+6
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'label-filter' into 'master' Jacob Schatz2016-04-133-2/+33
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | Filtering by any label keeps the text on the toggle buttonlabel-filterPhil Hughes2016-04-122-1/+10
| | | | | | | | | | | | |
| * | | | | | | | | | | | Added label filter testsPhil Hughes2016-04-071-0/+22
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fixed issue with any label & no label filters missingPhil Hughes2016-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #15008
* | | | | | | | | | | | | Merge branch 'external-omniauth-providers' into 'master' Marin Jankovski2016-04-136-9/+70
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | Better control flow.external-omniauth-providersPatricio Cano2016-04-111-6/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | Added CHANGELOG itemPatricio Cano2016-04-111-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Documentation of featurePatricio Cano2016-04-112-0/+30
| | | | | | | | | | | | |
| * | | | | | | | | | | | Added default setting for `external_providers`Patricio Cano2016-04-111-9/+28
| | | | | | | | | | | | |
| * | | | | | | | | | | | Allow `external_providers` for Omniauth to be defined to mark these users as ↵Patricio Cano2016-04-112-0/+13
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | external
* | | | | | | | | | | | Merge branch 'rs-archive-cache-worker-cron' into 'master' Dmitriy Zaporozhets2016-04-134-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move RepositoryArchiveCacheWorker to sidekiq-cron Closes #15105 See merge request !3663
| * | | | | | | | | | | | Move RepositoryArchiveCacheWorker to sidekiq-cronrs-archive-cache-worker-cronRobert Speicher2016-04-124-2/+6
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #15105
* | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-04-13118-481/+4246
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs-gitlab-com-check' into 'master' Dmitriy Zaporozhets2016-04-132-0/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | | Add `Gitlab.com?` methodrs-gitlab-com-checkRobert Speicher2016-04-122-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | | | | Merge branch 'api-group-leaking' into 'master' Rémy Coutable2016-04-134-14/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | | Fix group_member_spec to not leak informationRobert Schilling2016-04-131-5/+7
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | API: Avoid group leak while updating the groupRobert Schilling2016-04-131-2/+2
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | API: Return 404 if user does not have access to groupRobert Schilling2016-04-133-7/+12
| | | | | | | | | | | | | |