Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'import-gh-pull-requests' into 'master' | Douwe Maan | 2016-01-06 | 3 | -0/+403 |
|\ | |||||
| * | Ensure that we're only importing local pull requests | Douglas Barbosa Alexandre | 2016-01-05 | 1 | -0/+22 |
| * | Generate separate comments when importing GitHub Issues into GitLab | Douglas Barbosa Alexandre | 2016-01-05 | 3 | -4/+152 |
| * | Refactoring GithubImport::Importer | Douglas Barbosa Alexandre | 2016-01-05 | 2 | -0/+233 |
* | | Fix notification specfix-notification-spec | Douwe Maan | 2016-01-05 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'mikew1/gitlab-ce-better-asana-refs' into 'master' | Douwe Maan | 2016-01-05 | 1 | -6/+71 |
|\ | |||||
| * | Satisfy Rubocop | Douwe Maan | 2016-01-05 | 1 | -1/+1 |
| * | Merge remote-tracking branch 'upstream/master' into better-asana-refs | Mike Wyatt | 2015-12-31 | 73 | -189/+2175 |
| |\ | |||||
| * | | 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 |
| * | | Merge remote-tracking branch 'origin/master' into better-asana-refs | Mike Wyatt | 2015-12-30 | 23 | -40/+40 |
| |\ \ | |||||
| * | | | Update Asana specs | Mike Wyatt | 2015-12-29 | 1 | -8/+32 |
| * | | | better support for referencing and closing issues in asana_service.rb | Mike Wyatt | 2015-12-16 | 1 | -0/+21 |
* | | | | Merge branch 'rs-abuse-reports-refactor' into 'master' | Douwe Maan | 2016-01-05 | 3 | -55/+80 |
|\ \ \ \ | |||||
| * | | | | Add `AbuseReport#notify`rs-abuse-reports-refactor | Robert Speicher | 2016-01-04 | 2 | -55/+42 |
| * | | | | Make AbuseReportMailer responsible for knowing if it should deliver | Robert Speicher | 2016-01-04 | 1 | -0/+38 |
* | | | | | Merge branch 'pr-9938' into 'master' | Douwe Maan | 2016-01-05 | 1 | -0/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Merge pull request GH-9938 from huacnlee/hotfix/note_mail_with_notificationpr-9938 | Douwe Maan | 2016-01-04 | 1 | -0/+3 |
* | | | | | | Merge branch 'rs-relative-links-to-root' into 'master' | Douwe Maan | 2016-01-05 | 1 | -0/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Support a single directory traversal in RelativeLinkFilterrs-relative-links-to-root | Robert Speicher | 2015-12-30 | 1 | -0/+8 |
* | | | | | | | Merge branch 'fix-api-lookup-with-usernames-with-dots' of https://gitlab.com/... | Dmitriy Zaporozhets | 2016-01-05 | 1 | -0/+9 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix API project lookups when querying with a namespace with dots | Stan Hu | 2016-01-03 | 1 | -0/+9 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'improved-leave-project' into 'master' | Dmitriy Zaporozhets | 2016-01-05 | 1 | -2/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rempves tests for "you have master access" textimproved-leave-project | Jacob Schatz | 2016-01-04 | 1 | -1/+0 |
| * | | | | | | | adds proper `it` for multi line. adds `find` with correct id for button. | Jacob Schatz | 2015-12-28 | 1 | -3/+3 |
| * | | | | | | | Merge branch 'master' into improved-leave-project | Jacob Schatz | 2015-12-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | fixes tests failing | Jacob Schatz | 2015-12-28 | 1 | -1/+4 |
* | | | | | | | | | Merge branch 'metrics-tuning' into 'master' | Dmitriy Zaporozhets | 2016-01-05 | 8 | -136/+74 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix Rubocop styling in AR subscriber specsmetrics-tuning | Yorick Peterse | 2016-01-04 | 1 | -1/+1 |
| * | | | | | | | | | Automatically prefix transaction series names | Yorick Peterse | 2016-01-04 | 5 | -8/+8 |
| * | | | | | | | | | Use separate series for Rails/Sidekiq sample stats | Yorick Peterse | 2016-01-04 | 1 | -8/+30 |
| * | | | | | | | | | Track total method call times per transaction | Yorick Peterse | 2016-01-04 | 1 | -0/+6 |
| * | | | | | | | | | Track total query/view timings in transactions | Yorick Peterse | 2016-01-04 | 2 | -0/+38 |
| * | | | | | | | | | Ability to increment custom transaction values | Yorick Peterse | 2016-01-04 | 1 | -0/+12 |
| * | | | | | | | | | Removed tracking of hostnames for metrics | Yorick Peterse | 2015-12-31 | 2 | -8/+0 |
| * | | | | | | | | | Use separate series for Rails/Sidekiq transactions | Yorick Peterse | 2015-12-31 | 5 | -6/+5 |
| * | | | | | | | | | Cache InfluxDB settings after the first use | Yorick Peterse | 2015-12-31 | 1 | -9/+3 |
| * | | | | | | | | | Removed tracking of raw SQL queries | Yorick Peterse | 2015-12-31 | 2 | -125/+0 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Don't notify users twice if they are both project watchers and subscribers | Stan Hu | 2016-01-04 | 1 | -0/+12 |
| |_|_|_|_|/ / / |/| | | | | | | | |||||
* | | | | | | | | Merge branch 'show-all-builds-by-default' into 'master' | Robert Speicher | 2016-01-04 | 2 | -54/+88 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Show 'All' tab by default in the builds pageshow-all-builds-by-default | Douglas Barbosa Alexandre | 2016-01-04 | 2 | -54/+88 |
* | | | | | | | | Merge branch 'rs-issue-201' into 'master' | Dmitriy Zaporozhets | 2016-01-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Prevent duplicate "username has already been taken" validation messagers-issue-201 | Robert Speicher | 2016-01-02 | 1 | -1/+1 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'extra-system-hooks' into 'master' | Stan Hu | 2016-01-04 | 1 | -14/+33 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Added system hooks messages for renaming and transferring a project | Steve Norman | 2016-01-04 | 1 | -14/+33 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | remove public field from namespace and refactoringnamespace-clean_up | Valery Sizov | 2016-01-04 | 4 | -125/+1 |
|/ / / / / / / | |||||
* | | | | | | | Optimize CSS expressions produced by Nokogiriautocomplete-performance | Yorick Peterse | 2015-12-31 | 1 | -0/+13 |
|/ / / / / / | |||||
* | | | | | | Removed various default metrics tagsreduce-influxdb-tags | Yorick Peterse | 2015-12-31 | 1 | -3/+0 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge branch 'upvote_count_to_api' into 'master' | Valery Sizov | 2015-12-29 | 1 | -0/+14 |
|\ \ \ \ \ | |||||
| * | | | | | Revert upvotes and downvotes params to MR API | Valery Sizov | 2015-12-28 | 1 | -0/+14 |