Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge branch 'manual-actions' into 'master' | Rémy Coutable | 2016-07-19 | 1 | -2/+2 | |
|\ \ \ \ | ||||||
| * | | | | Add implementation of manual actions | Kamil Trzcinski | 2016-07-18 | 1 | -2/+2 | |
* | | | | | Merge branch 'api-cleanup-entities' into 'master' | Rémy Coutable | 2016-07-19 | 2 | -42/+21 | |
|\ \ \ \ \ | ||||||
| * | | | | | Simplify entities for branches and tags APIapi-cleanup-entities | Robert Schilling | 2016-07-19 | 2 | -42/+21 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge branch 'deployment-tracking' into 'master' | Rémy Coutable | 2016-07-19 | 1 | -0/+9 | |
|\ \ \ \ \ | ||||||
| * | | | | | Added Rake task for tracking deploymentsdeployment-tracking | Yorick Peterse | 2016-07-19 | 1 | -0/+9 | |
* | | | | | | Merge branch 'api-delete-todos' into 'master' | Rémy Coutable | 2016-07-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Return the number of marked todosapi-delete-todos | Robert Schilling | 2016-07-19 | 1 | -1/+1 | |
* | | | | | | Merge branch 'api-dev-can-push' into 'master' | Rémy Coutable | 2016-07-19 | 3 | -4/+36 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | Only update once | Robert Schilling | 2016-07-19 | 1 | -2/+3 | |
| * | | | | | API: Expose 'developers_can_merge' for branches | Robert Schilling | 2016-07-19 | 2 | -1/+11 | |
| * | | | | | API: Expose 'developers_can_push' for branches | Robert Schilling | 2016-07-19 | 3 | -4/+25 | |
* | | | | | | Squashed - fix encoding issuefix/import-export-encoding | James Lopez | 2016-07-19 | 3 | -2/+11 | |
|/ / / / / | ||||||
* | | | | | Merge branch 'cs-gemojione-3' into 'master' | Robert Speicher | 2016-07-18 | 2 | -23/+18 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | ||||||
| * | | | | Upgrade Gemojione from 2.6.1 to 3.0.1. | Connor Shea | 2016-07-18 | 2 | -23/+18 | |
* | | | | | Merge branch '19820-safer-diffs' into 'master' | Douwe Maan | 2016-07-18 | 1 | -5/+1 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Collapsed diffs lines/size don't accumulate to overflow diffs.19820-safer-diffs | Paco Guzman | 2016-07-18 | 1 | -5/+1 | |
* | | | | | Merge branch 'undo-revert-of-4892' into 'master' 19396-api-allow-admin-owner-to-set-timestamp-when-changing-issue-state | Rémy Coutable | 2016-07-18 | 9 | -136/+213 | |
|\ \ \ \ \ | ||||||
| * | | | | | Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' "" | Rémy Coutable | 2016-07-18 | 9 | -136/+213 | |
* | | | | | | Merge branch '18593-avoid-parse_html-when-rinku-didnt-do-anything' into 'mast... | Yorick Peterse | 2016-07-18 | 1 | -0/+2 | |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | ||||||
| * | | | | | Don't parse Rinku returned value to DocFragment when it didn't change the ori...18593-avoid-parse_html-when-rinku-didnt-do-anything | Paco Guzman | 2016-07-18 | 1 | -0/+2 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge branch 'store-variables-and-when-in-builds-table' into 'master' | Rémy Coutable | 2016-07-18 | 1 | -15/+38 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into store-variables...store-variables-and-when-in-builds-table | Kamil Trzcinski | 2016-07-18 | 16 | -227/+116 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Store when and yaml variables in builds table | Kamil Trzcinski | 2016-07-16 | 1 | -15/+38 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Merge branch 'docker-registry-work-with-redirect' into 'master' | Rémy Coutable | 2016-07-18 | 2 | -21/+50 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Make rubocop happy | Kamil Trzcinski | 2016-07-15 | 1 | -1/+1 | |
| * | | | | | | Explicitly remove authorization token and make sure that invalid addresses ar... | Kamil Trzcinski | 2016-07-15 | 1 | -37/+35 | |
| * | | | | | | Allow blob to be redirected | Kamil Trzcinski | 2016-07-15 | 1 | -3/+34 | |
| * | | | | | | Make docker registry work with location redirects when external storage is used | Kamil Trzcinski | 2016-07-15 | 1 | -1/+1 | |
* | | | | | | | allow empty repos on import/export | James Lopez | 2016-07-18 | 4 | -10/+5 | |
| |_|_|/ / / |/| | | | | | ||||||
* | | | | | | Merge branch 'api-isssues-due-date' into 'master' | Rémy Coutable | 2016-07-18 | 2 | -4/+7 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | API: Expose due_date for issuesapi-isssues-due-date | Robert Schilling | 2016-07-12 | 2 | -4/+7 | |
* | | | | | | Merge branch 'track-pipeline-user' into 'master' | Rémy Coutable | 2016-07-18 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | Track a user who created a pipeline | Kamil Trzcinski | 2016-07-15 | 1 | -1/+1 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge branch 'fix-lfs-ci-fetch' into 'master' | Rémy Coutable | 2016-07-18 | 3 | -3/+3 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | ||||||
| * | | | | Fix LFS specsfix-lfs-ci-fetch | Kamil Trzcinski | 2016-07-15 | 2 | -2/+2 | |
| * | | | | Fix fetching LFS objects for private CI projects | Kamil Trzcinski | 2016-07-15 | 1 | -1/+1 | |
* | | | | | Merge branch 'normalize_emoji_aliases_paths' into 'master' | Rémy Coutable | 2016-07-18 | 1 | -2/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix not normalized emoji paths | dixpac | 2016-07-14 | 1 | -2/+2 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge branch '19842-cloning-a-gitlab-wiki-returns-the-repo-not-the-repo-s-wik... | Stan Hu | 2016-07-16 | 1 | -1/+6 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix a bug where the project's repository path was returned instead of the wik...19842-cloning-a-gitlab-wiki-returns-the-repo-not-the-repo-s-wiki | Alejandro Rodríguez | 2016-07-15 | 1 | -1/+6 | |
* | | | | | | Merge branch 'syntax-highlight-unknown-language' into 'master' | Robert Speicher | 2016-07-16 | 1 | -7/+8 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Don't fail to highlight when Rouge doesn't have a lexer | Douwe Maan | 2016-07-15 | 1 | -7/+8 | |
* | | | | | | Merge branch 'mentioned-user-tooltip' into 'master' | Douwe Maan | 2016-07-15 | 1 | -5/+5 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Display tooltip for mentioned users and groups (!5261) | winniehell | 2016-07-14 | 1 | -5/+5 | |
| |/ / / / | ||||||
* | | | | | Merge branch 'feature.rouge-20' into 'master' | Robert Speicher | 2016-07-15 | 3 | -184/+39 | |
|\ \ \ \ \ | ||||||
| * | | | | | use %(...) and %[...] in favor of %<...>feature.rouge-20 | http://jneen.net/ | 2016-07-14 | 2 | -4/+4 | |
| * | | | | | use the proper variable names o_O | http://jneen.net/ | 2016-07-14 | 1 | -2/+2 | |
| * | | | | | style: factor out `@lexer` into a method | http://jneen.net/ | 2016-07-14 | 1 | -9/+13 | |
| * | | | | | fix Gitlab::Highlight#initializer bugs from rebase | http://jneen.net/ | 2016-07-14 | 1 | -1/+2 |