summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove InfluxDB username/passwordremove-influxdb-credentialsYorick Peterse2016-01-065-26/+16
| | | | | InfluxDB over UDP doesn't use authentication, thus there's no need for these settings.
* Merge branch 'metrics-milliseconds' into 'master' Yorick Peterse2016-01-064-6/+14
|\ | | | | See merge request !2316
| * Store SQL/view timings in millisecondsYorick Peterse2016-01-064-6/+14
| | | | | | | | | | Transaction timings are also already stored in milliseconds, this keeps things consistent.
* | Merge branch 'azure_oauth2' into 'master' Stan Hu2016-01-067-1/+92
|\ \ | |/ |/| | | | | | | | | Enable Microsoft Azure OAuth2 support Added Microsoft Azure as OAuth2 provider (https://github.com/KonaTeam/omniauth-azure-oauth2) including docs and icon. See merge request !2187
| * Enable Microsoft Azure OAuth2 supportJanis Meybohm2016-01-067-1/+92
|/
* Merge branch 'fix/project-destroy-callbacks' into 'master' Douwe Maan2016-01-061-4/+2
|\ | | | | | | | | | | | | Fix project destroy callback See gitlab-org/gitlab-ee!107. See merge request !2307
| * Fix project destroy callbackfix/project-destroy-callbacksGrzegorz Bizon2016-01-051-4/+2
| | | | | | | | See gitlab-org/gitlab-ee!107.
* | Merge branch 'import-gh-pull-requests' into 'master' Douwe Maan2016-01-0610-24/+681
|\ \ | | | | | | | | | | | | | | | | | | Import GitHub Pull Requests into GitLab Fixes #2833 See merge request !2168
| * | Update doc for importing existing GitHub projects to GitLabimport-gh-pull-requestsDouglas Barbosa Alexandre2016-01-051-2/+2
| | |
| * | Ensure that we're only importing local pull requestsDouglas Barbosa Alexandre2016-01-053-1/+31
| | |
| * | Update CHANGELOGDouglas Barbosa Alexandre2016-01-051-0/+1
| | |
| * | Generate separate comments when importing GitHub Issues into GitLabDouglas Barbosa Alexandre2016-01-058-76/+266
| | |
| * | Refactoring GithubImport::ImporterDouglas Barbosa Alexandre2016-01-055-61/+407
| | |
| * | Extract methods to import comments on a GitHub Pull RequestDouglas Barbosa Alexandre2016-01-051-24/+28
| | |
| * | Doesn't import GitHub PR where branches were no longer availableDouglas Barbosa Alexandre2016-01-051-38/+44
| | |
| * | Import comments on the diff of a GitHub Pull Request into GitLabDouglas Barbosa Alexandre2016-01-051-0/+16
| | |
| * | Import comments on GitHub Pull Request into GitLabDouglas Barbosa Alexandre2016-01-051-0/+14
| | |
| * | Import GitHub Pull Requests into GitLabDouglas Barbosa Alexandre2016-01-051-7/+57
| |/
* | Merge branch 'fix-notification-spec' into 'master' Douwe Maan2016-01-061-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix notification spec Master was broken :( See merge request !2306
| * | Fix notification specfix-notification-specDouwe Maan2016-01-051-1/+1
| |/
* | Merge branch 'rs-fix-abuse-report-url' into 'master' Dmitriy Zaporozhets2016-01-061-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix the abuse report detail URL in the HTML email template Previous URL resulted in a 404. See merge request !2310
| * | Fix the abuse report detail URL in the HTML email templaters-fix-abuse-report-urlRobert Speicher2016-01-051-1/+1
| | |
* | | Merge branch 'feature/detailed-user-endpoint' of ↵Dmitriy Zaporozhets2016-01-063-1/+11
|\ \ \ | | | | | | | | | | | | https://gitlab.com/Michi302/gitlab-ce
| * | | Add missing changelog entryMichi302/gitlab-ce-feature/detailed-user-endpointMichi3022016-01-051-0/+1
| | | |
| * | | Make single user API endpoint return Entities::User instead of ↵Michi3022015-12-282-1/+8
| | | | | | | | | | | | | | | | Entities::UserBasic
* | | | Merge pull request #9912 from pmq20/psvr/dec15Stan Hu2016-01-051-0/+1
|\ \ \ \ | |_|/ / |/| | | Ignore config/sidekiq.yml
| * | | Ignore config/sidekiq.yml [ci skip]The rugged tests are fragile2015-12-151-0/+1
| | | |
* | | | Merge branch 'validate-readme-format' into 'master'Robert Speicher2016-01-052-8/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Validate README format Take the first previewable README file as project's README, otherwise if none file is available, or we can't preview any of them, we assume that project doesn't have a README file. Fixes #3978
| * | | | [ci skip] Update CHANGELOGvalidate-readme-formatDouglas Barbosa Alexandre2016-01-051-0/+1
| | | | |
| * | | | Validate README format before displayingDouglas Barbosa Alexandre2016-01-051-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Take the first previewable README file as project’s README, otherwise if none file is available, or we can’t preview any of them, we assume that project doesn’t have a README file.
* | | | | Merge branch 'rs-version-check-svg' into 'master' Robert Speicher2016-01-052-1/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Update version check images to use SVG See merge request !2244
| * | | | Update version check images to use SVGRobert Speicher2016-01-052-1/+2
|/ / / /
* | | | Merge branch 'mikew1/gitlab-ce-better-asana-refs' into 'master' Douwe Maan2016-01-052-48/+111
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better support for referencing and closing issues in asana_service.rb (by @mikew1) See merge request !2302
| * | | | Satisfy RubocopDouwe Maan2016-01-051-1/+1
| | | | |
| * | | | Don't log backtrace in Asana servicemikew1/gitlab-ce-better-asana-refsMike Wyatt2016-01-041-1/+0
| | | | |
| * | | | Merge remote-tracking branch 'upstream/master' into better-asana-refsMike Wyatt2015-12-31403-2136/+22333
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (307 commits) Update CHANGELOG spinach fix Updated allocations Gem to version 1.0.3 Removed various default metrics tags Update CHANGELOG Fix "I see current user as the first user" step Swap Author and Assignee Selectors on issuable index view Update CHANGELOG Make sure that is no pending migrations in Gitlab::CurrentSettings Added additional config environmental variables to help Debian packaging We don't use whenever anymore. Lets remove the schedule file Fix project transfer e-mail sending incorrect paths in e-mail notification Update CHANGELOG Use Gitlab::CurrentSettings for InfluxDB Write to InfluxDB directly via UDP Strip newlines from obfuscated SQL Add hotfix that allows to access build artifacts created before 8.3 note votes methids implementation When reCAPTCHA is disabled, allow registrations to go through without a code Downcased user or email search for avatar_icon. ...
| * | | | | Use `execute` in Asana specsMike Wyatt2015-12-311-15/+18
| | | | | |
| * | | | | Actually test the posted comment in Asana serviceMike Wyatt2015-12-311-4/+21
| | | | | |
| * | | | | Better handling of errors in Asana serviceMike Wyatt2015-12-301-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Update Asana service documentationMike Wyatt2015-12-301-2/+2
| | | | | |
| * | | | | Restore colon in Asana commentMike Wyatt2015-12-301-1/+1
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/master' into better-asana-refsMike Wyatt2015-12-3084-495/+546
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: Use lazy reference extractor to get issue's MRs Banzai::XFilter -> Banzai::Filter::XFilter Move Markdown/reference logic from Gitlab::Markdown to Banzai
| * | | | | | Fix error in Asana serviceMike Wyatt2015-12-291-1/+1
| | | | | | |
| * | | | | | Update Asana specsMike Wyatt2015-12-291-8/+32
| | | | | | |
| * | | | | | Update Asana service to work with Personal Access Token, lessen number of ↵Mike Wyatt2015-12-291-31/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | requests to Asana API
| * | | | | | Update Asana field descriptionsMike Wyatt2015-12-291-4/+2
| | | | | | |
| * | | | | | better support for referencing and closing issues in asana_service.rbMike Wyatt2015-12-162-8/+41
| | | | | | |
* | | | | | | Merge branch 'brunsa2/gitlab-ce-diverging-branch-graphs' into 'master' Douwe Maan2016-01-056-0/+117
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add graphs of commits ahead/behind default branch (by @brunsa2) Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1716 See merge request !2301
| * | | | | | | Fix diverging commit count calculationbrunsa2/gitlab-ce-diverging-branch-graphsJeff Stubler2015-12-151-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rugged seemed to stop accepting branch names as valid refs, throwing `Rugged::ReferenceError` exceptions. Now the branch target rather than branch name is used, and the default branch's hash is also calculated, and these work properly. This used to work and might be something worth re-investigating in the future.
| * | | | | | | Merge branch 'master' into diverging-branch-graphsJeff Stubler2015-12-03582-4651/+9171
| |\ \ \ \ \ \ \
View Lorry Controller Status