Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'add-assign-me-alias' into 'master' | Rémy Coutable | 2017-08-07 | 3 | -5/+36 |
|\ | |||||
| * | Move `let` calls inside the `describe` block using them | Mehdi Lahmam | 2017-08-07 | 1 | -5/+5 |
| * | Add `/assign me` alias support for assigning issuables to oneself | Mehdi Lahmam | 2017-08-07 | 2 | -0/+31 |
* | | Merge branch '32300__expose_more_attributes' into 'master' | Rémy Coutable | 2017-08-07 | 3 | -3/+26 |
|\ \ | |||||
| * | | Expose more attributes to unauthenticated GET /projects/:id | Tony | 2017-08-03 | 3 | -3/+26 |
* | | | Merge branch 'mattermost_fixes' into 'master' | Sean McGivern | 2017-08-07 | 1 | -3/+4 |
|\ \ \ | |||||
| * | | | Fix Mattermost integrationmattermost_fixes | Valery Sizov | 2017-08-04 | 1 | -3/+4 |
* | | | | Merge branch 'gitaly-renames-annotations' into 'master' | Sean McGivern | 2017-08-07 | 2 | -7/+6 |
|\ \ \ \ | |||||
| * | | | | Remove unnecessary 'raw' alias | Jacob Vosmaer | 2017-08-03 | 2 | -2/+1 |
| * | | | | Rename 'commits_between' to 'rugged_commits_between' | Jacob Vosmaer | 2017-08-03 | 1 | -5/+5 |
* | | | | | Merge branch '33095-mr-widget-ui' into 'master' | Phil Hughes | 2017-08-07 | 22 | -117/+80 |
|\ \ \ \ \ | |||||
| * | | | | | clean up merge request widget UI | Simon Knox | 2017-08-07 | 22 | -117/+80 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Fix issues with pdf-js dependencies | Mike Greiling | 2017-08-07 | 2 | -4/+4 |
|/ / / / | |||||
* | | | | Merge branch '27616-fix-contributions-graph-utc-offset-mysql' into 'master' | Tim Zallmann | 2017-08-06 | 1 | -4/+34 |
|\ \ \ \ | |||||
| * | | | | add tests for proper timezone date grouping within ContributionsCalendar | Mike Greiling | 2017-07-31 | 1 | -4/+34 |
* | | | | | Merge branch 'fix/sm/34547-cannot-connect-to-ci-server-error-messages' into '... | Sean McGivern | 2017-08-04 | 1 | -27/+70 |
|\ \ \ \ \ | |||||
| * | | | | | Fix specfix/sm/34547-cannot-connect-to-ci-server-error-messages | Shinya Maeda | 2017-08-04 | 1 | -2/+2 |
| * | | | | | Fix spec | Shinya Maeda | 2017-08-04 | 1 | -1/+3 |
| * | | | | | Add a spec for concurrent process | Shinya Maeda | 2017-08-04 | 1 | -27/+68 |
* | | | | | | Merge branch 'fix/sm/35931-active-ci-pipelineschedule-have-nullified-next_run... | Sean McGivern | 2017-08-04 | 1 | -0/+19 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix specfix/sm/35931-active-ci-pipelineschedule-have-nullified-next_run_at | Shinya Maeda | 2017-08-04 | 1 | -7/+3 |
| * | | | | | | fix | Shinya Maeda | 2017-08-04 | 1 | -0/+23 |
| |/ / / / / | |||||
* | | | | | | Merge branch '34060-simplified-general-project-settings' into 'master' | Mike Greiling | 2017-08-04 | 3 | -12/+41 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fixed up specs | Phil Hughes | 2017-07-28 | 1 | -6/+14 |
| * | | | | | | trying to fix tests | tauriedavis | 2017-07-28 | 1 | -1/+12 |
| * | | | | | | try and fix some tests | tauriedavis | 2017-07-28 | 2 | -5/+15 |
* | | | | | | | Merge branch 'tc-fix-mr-query-params' into 'master' | Rémy Coutable | 2017-08-04 | 1 | -0/+20 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add spec to test combining API merge_requests query parameters | Toon Claes | 2017-08-03 | 1 | -0/+20 |
* | | | | | | | | Merge branch '2902-standalone-ee-dir-ce' into 'master' | Rémy Coutable | 2017-08-04 | 1 | -8/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Backport to CE for:2902-standalone-ee-dir-ce | Lin Jen-Shin | 2017-08-04 | 1 | -8/+10 |
* | | | | | | | | | Merge branch 'revert-6291bc8c' into 'master' | Rémy Coutable | 2017-08-04 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Revert "Merge branch 'rs-warm-capybara-only-in-ci' into 'master'"revert-6291bc8c | Robert Speicher | 2017-08-03 | 1 | -1/+0 |
* | | | | | | | | | | Merge branch 'feature/migrate-last-commit-for-path-to-gitaly' into 'master' | Robert Speicher | 2017-08-04 | 1 | -10/+30 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Migrate Repository#last_commit_for_path to Gitaly | Ahmad Sherif | 2017-08-03 | 1 | -10/+30 |
* | | | | | | | | | | | Merge branch 'feature/migrate-load-blame-to-gitaly' into 'master' | Robert Speicher | 2017-08-04 | 1 | -46/+56 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Migrate blame loading to Gitalyfeature/migrate-load-blame-to-gitaly | Ahmad Sherif | 2017-08-03 | 1 | -46/+56 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'rs-issue-35701' into 'master' | Rémy Coutable | 2017-08-04 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Ensure DeviseHelpers is loaded before inclusion in LoginHelpersrs-issue-35701 | Robert Speicher | 2017-08-03 | 1 | -0/+2 |
* | | | | | | | | | | | Merge branch 'refactor.notification-recipient-builders' into 'master' | Sean McGivern | 2017-08-04 | 2 | -34/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | rm a now-useless spec | http://jneen.net/ | 2017-08-03 | 1 | -34/+0 |
| * | | | | | | | | | | | add builder helpers with levels and start to separate out #filter! | http://jneen.net/ | 2017-08-03 | 1 | -0/+5 |
* | | | | | | | | | | | | Merge branch 'fix-jira-integration' into 'master' | Rémy Coutable | 2017-08-04 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Ensure `JIRA::Resource::Issue` responds to `resolution` before calling it | Mehdi Lahmam | 2017-08-03 | 1 | -0/+9 |
* | | | | | | | | | | | | | Remove monkey-patched Array.prototype.first() and last() methods | Mike Greiling | 2017-08-04 | 7 | -30/+3 |
* | | | | | | | | | | | | | Merge branch 'diff-changed-files-dropdown' into 'master' | Filipa Lacerda | 2017-08-04 | 1 | -0/+52 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | fixed jumping when bar gets stuck | Phil Hughes | 2017-08-03 | 1 | -0/+52 |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Resolve "Specific Async Script Loading by using a Page Variable" | Tim Zallmann | 2017-08-03 | 1 | -0/+13 |
| |_|_|_|/ / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'tc-no-todo-service-select-mysql' into 'master' | Sean McGivern | 2017-08-03 | 1 | -5/+28 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Avoid plucking Todo ids and use sub-queries instead | Toon Claes | 2017-08-03 | 1 | -5/+28 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | fix #3686 make tarball download url to end with extension | haseeb | 2017-08-03 | 2 | -4/+8 |