Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge branch 'sh-fix-events-update-spec' into 'master' | Yorick Peterse | 2016-10-07 | 1 | -1/+4 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix Event#reset_project_activity updatessh-fix-events-update-spec | Stan Hu | 2016-10-06 | 1 | -1/+4 | |
* | | | | | | | Merge branch 'memoize_shell_secret_token' into 'master' | Rémy Coutable | 2016-10-07 | 1 | -3/+6 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Call ensure_secret_token! in secret token test's before block since it would ... | Justin DiPierro | 2016-10-06 | 1 | -0/+1 | |
| * | | | | | | | Load Github::Shell's secret token from file on initialization instead of ever... | Justin DiPierro | 2016-10-06 | 1 | -3/+5 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'ben.boeckel/gitlab-ce-api-visible-projects' into 'master' | Rémy Coutable | 2016-10-07 | 1 | -0/+30 | |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | ||||||
| * | | | | | | Update API docs and specs for /projects/visible | Sean McGivern | 2016-10-04 | 1 | -2/+21 | |
| * | | | | | | api: add /projects/visible API endpoint | Ben Boeckel | 2016-10-04 | 1 | -0/+11 | |
* | | | | | | | Enable CacheMarkdownField for the remaining models | Nick Thomas | 2016-10-07 | 2 | -2/+16 | |
* | | | | | | | Use CacheMarkdownField for notes | Nick Thomas | 2016-10-07 | 2 | -41/+24 | |
* | | | | | | | Add markdown cache columns to the database, but don't use them yet | Nick Thomas | 2016-10-07 | 12 | -16/+287 | |
| |_|_|_|/ / |/| | | | | | ||||||
* | | | | | | Merge branch '23025-issue-boards-defaults' into 'master' | Jacob Schatz | 2016-10-06 | 2 | -7/+6 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | Update issue board spec | Annabel Dunstone Gray | 2016-10-06 | 2 | -7/+6 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge branch 'fix-already-selected-activity-link' into 'master' | Fatih Acet | 2016-10-06 | 3 | -0/+131 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix inconsistent highlighting of already selected activity nav-links | Clement Ho | 2016-10-05 | 3 | -0/+131 | |
* | | | | | | Update user routing spec after constrainer logic changeddz-root-url | Dmitriy Zaporozhets | 2016-10-06 | 1 | -1/+1 | |
* | | | | | | Make user constrainer lookup same as controller and add more constrainer tests | Dmitriy Zaporozhets | 2016-10-06 | 3 | -1/+20 | |
* | | | | | | Fix users feature spec | Dmitriy Zaporozhets | 2016-10-06 | 1 | -13/+2 | |
* | | | | | | Change user & group landing page routing from /u/:name & /groups/:name to /:name | Dmitriy Zaporozhets | 2016-10-06 | 5 | -3/+53 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Merge branch 'issue-boards-new-issue' into 'master' | Fatih Acet | 2016-10-06 | 3 | -7/+170 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | ||||||
| * | | | | Add tests to Projects::Boards::IssuesController#create action | Douglas Barbosa Alexandre | 2016-10-06 | 1 | -7/+57 | |
| * | | | | Add service to create a new issue in a board list | Douglas Barbosa Alexandre | 2016-10-06 | 1 | -0/+33 | |
| * | | | | Added tests | Phil Hughes | 2016-10-06 | 1 | -0/+80 | |
* | | | | | Revert "Label list shows all issues (opened or closed) with that label" | Douglas Barbosa Alexandre | 2016-10-06 | 1 | -4/+4 | |
* | | | | | Merge branch 'rc-use-grape-dsl-to-document-members-api' into 'master' | Robert Speicher | 2016-10-06 | 1 | -4/+12 | |
|\ \ \ \ \ | ||||||
| * | | | | | Use Grape DSL to document methods and their paramsrc-use-grape-dsl-to-document-members-api | Rémy Coutable | 2016-10-05 | 1 | -4/+12 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge branch 'mahcsig/gitlab-ce-17350-multi-file-commit' | Rémy Coutable | 2016-10-06 | 2 | -8/+269 | |
|\ \ \ \ \ | ||||||
| * | | | | | multi-file commit | Marc Siegfriedt | 2016-10-05 | 2 | -8/+269 | |
* | | | | | | Merge branch 'issue-board-api-support' into 'master' | Dmitriy Zaporozhets | 2016-10-06 | 1 | -0/+192 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | Added Issue Board API support | Andre Guedes | 2016-10-05 | 1 | -0/+192 | |
* | | | | | | Use higher size on Gitlab::Redis connection pool on Sidekiq servers | Paco Guzman | 2016-10-06 | 1 | -0/+34 | |
* | | | | | | Merge branch 'feature/improve-async-pipeline-processing' into 'master' | Kamil Trzciński | 2016-10-06 | 5 | -3/+47 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add specs for new async ci pipeline workers | Grzegorz Bizon | 2016-10-04 | 2 | -0/+44 | |
| * | | | | | | Fix hipchat service specs after changes in pipeline | Grzegorz Bizon | 2016-10-04 | 1 | -1/+1 | |
| * | | | | | | Fix pipeline fixtures and calls to removed method | Grzegorz Bizon | 2016-10-04 | 2 | -2/+2 | |
* | | | | | | | Merge remote-tracking branch 'dev/master' | Rémy Coutable | 2016-10-06 | 2 | -0/+159 | |
|\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'fix/id-claim-import-issue' into 'master' | Douwe Maan | 2016-09-30 | 2 | -0/+159 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | Prevent claiming associated model IDs via import and added relevant specs | James Lopez | 2016-09-27 | 2 | -0/+159 | |
* | | | | | | | | | Merge commit 'dev/security' into 'master' | Rémy Coutable | 2016-10-06 | 10 | -13/+114 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | ||||||
| * | | | | | | | | fix export project file permissions issue | James Lopez | 2016-09-30 | 2 | -0/+6 | |
| * | | | | | | | | Merge branch 'fix/escape-builds-commands-in-ci-linter' into 'security' | Robert Speicher | 2016-09-28 | 1 | -0/+35 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Escape HTML nodes in builds commands in ci linter | Grzegorz Bizon | 2016-09-26 | 1 | -0/+35 | |
| | | |/ / / / / / | | |/| | | | | | | ||||||
| * | | | | | | | | Merge branch '22435-no-api-state-change-via-rails-session' into 'security' | Douwe Maan | 2016-09-28 | 1 | -6/+33 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | API: disable rails session auth for non-GET/HEAD requests | Nick Thomas | 2016-09-23 | 1 | -6/+33 | |
| * | | | | | | | | | Enforce the fork_project permission in Projects::CreateService | Nick Thomas | 2016-09-27 | 6 | -7/+29 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'revert-c676283b' into 'master' | Fatih Acet | 2016-10-05 | 6 | -13/+414 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b...revert-c676283b | Fatih Acet | 2016-10-05 | 4 | -23/+49 | |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b... | Fatih Acet | 2016-10-05 | 14 | -91/+378 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b... | Fatih Acet | 2016-10-04 | 13 | -58/+270 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into revert-c676283b | Phil Hughes | 2016-10-04 | 20 | -55/+225 | |
| |\ \ \ \ \ \ \ \ \ \ \ |