Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | Merge branch 'master' into merge-when-build-succeeds-uncheckedmerge-when-build-succeeds-unchecked | Douwe Maan | 2016-01-06 | 15 | -60/+251 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Get "Merge when build succeeds" to work when commits were pushed to MR target... | Douwe Maan | 2016-01-05 | 5 | -8/+15 | |
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'rs-issue-1697' into 'master' | Douwe Maan | 2016-01-06 | 1 | -0/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Define a limited set of filters for SingleLinePipeliners-issue-1697 | Robert Speicher | 2016-01-05 | 1 | -0/+16 | |
* | | | | | | | | | | | | | | | | Merge branch 'fix-banzai-cache' into 'master' | Robert Speicher | 2016-01-06 | 3 | -17/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Add regression test.fix-banzai-cache | Douwe Maan | 2016-01-06 | 1 | -1/+14 | |
| * | | | | | | | | | | | | | | | Fix mentionable reference extraction caching. | Douwe Maan | 2016-01-06 | 1 | -2/+5 | |
| * | | | | | | | | | | | | | | | Revert "Temporarily disable Markdown caching" | Douwe Maan | 2016-01-06 | 1 | -3/+1 | |
| * | | | | | | | | | | | | | | | Revert "Add DEBUG_BANZAI_CACHE env var to debug Banzai cache issue." | Douwe Maan | 2016-01-06 | 1 | -14/+7 | |
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'metrics-milliseconds' into 'master' | Yorick Peterse | 2016-01-06 | 4 | -6/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Store SQL/view timings in milliseconds | Yorick Peterse | 2016-01-06 | 4 | -6/+14 | |
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'azure_oauth2' into 'master' | Stan Hu | 2016-01-06 | 7 | -1/+92 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Enable Microsoft Azure OAuth2 support | Janis Meybohm | 2016-01-06 | 7 | -1/+92 | |
|/ / / / / / / / / / / / / / | ||||||
| | | | | | | | | | | | * | | Added CHANGELOG for housekeeping and changed GITLAB_SHELL_VERSION to 2.6.10 | Jeroen Nijhof | 2016-01-06 | 2 | -1/+2 | |
| | | | | | | | | | | | * | | Use panel-default and .form-actions | Jeroen Nijhof | 2016-01-06 | 1 | -11/+13 | |
| | | | | | | | | | | | * | | Merge gitlab.com:gitlab-org/gitlab-ce | Jeroen Nijhof | 2016-01-06 | 1577 | -17600/+50296 | |
| | | | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'fix/project-destroy-callbacks' into 'master' | Douwe Maan | 2016-01-06 | 1 | -4/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Fix project destroy callbackfix/project-destroy-callbacks | Grzegorz Bizon | 2016-01-05 | 1 | -4/+2 | |
* | | | | | | | | | | | | | | | Merge branch 'import-gh-pull-requests' into 'master' | Douwe Maan | 2016-01-06 | 10 | -24/+681 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Update doc for importing existing GitHub projects to GitLabimport-gh-pull-requests | Douglas Barbosa Alexandre | 2016-01-05 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | Ensure that we're only importing local pull requests | Douglas Barbosa Alexandre | 2016-01-05 | 3 | -1/+31 | |
| * | | | | | | | | | | | | | | Update CHANGELOG | Douglas Barbosa Alexandre | 2016-01-05 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | Generate separate comments when importing GitHub Issues into GitLab | Douglas Barbosa Alexandre | 2016-01-05 | 8 | -76/+266 | |
| * | | | | | | | | | | | | | | Refactoring GithubImport::Importer | Douglas Barbosa Alexandre | 2016-01-05 | 5 | -61/+407 | |
| * | | | | | | | | | | | | | | Extract methods to import comments on a GitHub Pull Request | Douglas Barbosa Alexandre | 2016-01-05 | 1 | -24/+28 | |
| * | | | | | | | | | | | | | | Doesn't import GitHub PR where branches were no longer available | Douglas Barbosa Alexandre | 2016-01-05 | 1 | -38/+44 | |
| * | | | | | | | | | | | | | | Import comments on the diff of a GitHub Pull Request into GitLab | Douglas Barbosa Alexandre | 2016-01-05 | 1 | -0/+16 | |
| * | | | | | | | | | | | | | | Import comments on GitHub Pull Request into GitLab | Douglas Barbosa Alexandre | 2016-01-05 | 1 | -0/+14 | |
| * | | | | | | | | | | | | | | Import GitHub Pull Requests into GitLab | Douglas Barbosa Alexandre | 2016-01-05 | 1 | -7/+57 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge branch 'fix-notification-spec' into 'master' | Douwe Maan | 2016-01-06 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Fix notification specfix-notification-spec | Douwe Maan | 2016-01-05 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge branch 'rs-fix-abuse-report-url' into 'master' | Dmitriy Zaporozhets | 2016-01-06 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Fix the abuse report detail URL in the HTML email templaters-fix-abuse-report-url | Robert Speicher | 2016-01-05 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | Merge branch 'feature/detailed-user-endpoint' of https://gitlab.com/Michi302/... | Dmitriy Zaporozhets | 2016-01-06 | 3 | -1/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Add missing changelog entryMichi302/gitlab-ce-feature/detailed-user-endpoint | Michi302 | 2016-01-05 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | Make single user API endpoint return Entities::User instead of Entities::User... | Michi302 | 2015-12-28 | 2 | -1/+8 | |
* | | | | | | | | | | | | | | | Merge pull request #9912 from pmq20/psvr/dec15 | Stan Hu | 2016-01-05 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Ignore config/sidekiq.yml [ci skip] | The rugged tests are fragile | 2015-12-15 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | Merge branch 'validate-readme-format' into 'master' | Robert Speicher | 2016-01-05 | 2 | -8/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | [ci skip] Update CHANGELOGvalidate-readme-format | Douglas Barbosa Alexandre | 2016-01-05 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | Validate README format before displaying | Douglas Barbosa Alexandre | 2016-01-05 | 1 | -8/+6 | |
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'rs-version-check-svg' into 'master' | Robert Speicher | 2016-01-05 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Update version check images to use SVG | Robert Speicher | 2016-01-05 | 2 | -1/+2 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge branch 'mikew1/gitlab-ce-better-asana-refs' into 'master' | Douwe Maan | 2016-01-05 | 2 | -48/+111 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Satisfy Rubocop | Douwe Maan | 2016-01-05 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | Don't log backtrace in Asana servicemikew1/gitlab-ce-better-asana-refs | Mike Wyatt | 2016-01-04 | 1 | -1/+0 | |
| * | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into better-asana-refs | Mike Wyatt | 2015-12-31 | 403 | -2136/+22333 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Use `execute` in Asana specs | Mike Wyatt | 2015-12-31 | 1 | -15/+18 | |
| * | | | | | | | | | | | | | Actually test the posted comment in Asana service | Mike Wyatt | 2015-12-31 | 1 | -4/+21 | |
| * | | | | | | | | | | | | | Better handling of errors in Asana service | Mike Wyatt | 2015-12-30 | 1 | -9/+8 |