Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'contributing-labels-stable-releases' into 'master' | Robert Speicher | 2016-02-02 | 1 | -0/+12 |
|\ | |||||
| * | Updated contributing guide for stable releasescontributing-labels-stable-releases | Yorick Peterse | 2016-02-02 | 1 | -0/+12 |
* | | Merge branch 'lazy-blobs' into 'master' | Jacob Vosmaer | 2016-02-02 | 8 | -6/+18 |
|\ \ | |||||
| * \ | Merge remote-tracking branch 'origin/master' into lazy-blobslazy-blobs | Jacob Vosmaer | 2016-02-02 | 21 | -32/+414 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge branch 'allow-@' into 'master' | Douwe Maan | 2016-02-02 | 2 | -4/+12 |
|\ \ \ | |||||
| * | | | Allow "@" in file names and pathallow-@ | Jacob Vosmaer | 2016-02-01 | 2 | -4/+12 |
* | | | | Merge branch 'generate-valid-message-id-for-email-rejections' into 'master' | Douwe Maan | 2016-02-02 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Generate valid Message-ID in email rejection mailer | Warren Guy | 2016-01-30 | 1 | -1/+1 |
* | | | | | Merge branch 'patch-1' into 'master' | Achilleas Pipinellis | 2016-02-02 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix typo indentation in CI projects' API | Louis Roché | 2016-01-22 | 1 | -1/+1 |
* | | | | | | Merge branch 'rs-regression-issue-guidelines' into 'master' | Dmitriy Zaporozhets | 2016-02-02 | 1 | -0/+20 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add notes about the regression issues to CONTRIBUTING.mdrs-regression-issue-guidelines | Robert Speicher | 2016-01-31 | 1 | -0/+20 |
* | | | | | | | Merge branch 'expand-git-instrumentation' into 'master' | Yorick Peterse | 2016-02-02 | 1 | -2/+14 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Instrument various Rugged constantsexpand-git-instrumentation | Yorick Peterse | 2016-02-01 | 1 | -0/+10 |
| * | | | | | | Instrument all Gitlab::Git instance methods | Yorick Peterse | 2016-02-01 | 1 | -2/+4 |
* | | | | | | | Merge branch 'rs-relax-autosize' into 'master' | Robert Speicher | 2016-02-01 | 5 | -3/+278 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Allow manual resize of js-autosize textareasrs-relax-autosize | Robert Speicher | 2016-02-01 | 5 | -3/+278 |
|/ / / / / / / | |||||
* | | | | | | | Update CHANGELOG | Robert Speicher | 2016-02-01 | 1 | -1/+1 |
* | | | | | | | Merge branch 'merge-request-closes-issues-performance' into 'master' | Robert Speicher | 2016-02-01 | 3 | -19/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Optimize fetching issues closed by a merge requestmerge-request-closes-issues-performance | Yorick Peterse | 2016-02-01 | 3 | -19/+12 |
* | | | | | | | | Merge branch 'stanhu/gitlab-ce-add-svg-support' into 'master' | Dmitriy Zaporozhets | 2016-02-01 | 8 | -1/+75 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | Render sanitized SVG images | Stan Hu | 2016-02-01 | 8 | -1/+75 |
|/ / / / / / / | |||||
| | | | | | * | Use gitlab_git 8.0.0 | Jacob Vosmaer | 2016-02-02 | 2 | -14/+8 |
| | | | | | * | Use begin/end instead of defined? | Jacob Vosmaer | 2016-02-02 | 1 | -5/+5 |
| | | | | | * | Move load command into _text partial | Jacob Vosmaer | 2016-02-02 | 2 | -1/+1 |
| | | | | | * | Update development version of gitlab_git | Jacob Vosmaer | 2016-02-01 | 1 | -1/+1 |
| | | | | | * | Update gitlab_git@lazy-blob again | Jacob Vosmaer | 2016-02-01 | 1 | -1/+1 |
| | | | | | * | Update gitlab_git (lazy-blob branch) | Jacob Vosmaer | 2016-02-01 | 1 | -2/+2 |
| | | | | | * | Develop with a custom gitlab_git branch | Jacob Vosmaer | 2016-02-01 | 2 | -7/+13 |
| | | | | | * | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-blobs | Jacob Vosmaer | 2016-02-01 | 430 | -2611/+16092 |
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge branch 'take-guidelines-into-account-for-mrs' into 'master' | Dmitriy Zaporozhets | 2016-02-01 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Link to Thoughtbot review guidelines.take-guidelines-into-account-for-mrs | Sytse Sijbrandij | 2016-01-30 | 1 | -0/+2 |
* | | | | | | | Merge branch 'rs-two-factor-casing' into 'master' | Robert Speicher | 2016-02-01 | 4 | -6/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Make "Two-factor" casing consistent throughout the applicationrs-two-factor-casing | Robert Speicher | 2016-01-31 | 4 | -6/+6 |
|/ / / / / / / | |||||
* | | | | | | | Update CHANGELOG | Robert Speicher | 2016-01-31 | 1 | -2/+6 |
* | | | | | | | Merge branch 'improve-gitlab-flow-doc' into 'master' | Achilleas Pipinellis | 2016-01-31 | 1 | -3/+4 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Improve GitLab flow documentation regarding the WIP merge requestsimprove-gitlab-flow-doc | Rémy Coutable | 2016-01-29 | 1 | -3/+4 |
* | | | | | | | Merge branch 'rename-inline-diff' into 'master' | Robert Speicher | 2016-01-31 | 13 | -78/+206 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Fewer html_safesrename-inline-diff | Douwe Maan | 2016-01-30 | 1 | -2/+2 |
| * | | | | | | Fix specs and add a new one | Douwe Maan | 2016-01-30 | 2 | -28/+37 |
| * | | | | | | Mark inline difference between old and new paths when a file is renamed | Douwe Maan | 2016-01-29 | 12 | -75/+194 |
* | | | | | | | Merge branch 'rs-issue-12706' into 'master' | Douwe Maan | 2016-01-30 | 6 | -14/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Increase the minimum length for commit SHA matching to 7rs-issue-12706 | Robert Speicher | 2016-01-29 | 6 | -14/+14 |
* | | | | | | | | Merge branch 'cache-broadcast-message-current' into 'master' | Dmitriy Zaporozhets | 2016-01-30 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Change ttl to 1 minutecache-broadcast-message-current | Josh Frye | 2016-01-29 | 1 | -1/+1 |
| * | | | | | | | | Cache BroadcastMessage.current for 5 minutes. Fixes #12770 | Josh Frye | 2016-01-29 | 1 | -1/+3 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge remote-tracking branch 'origin/background-delete-process' | Dmitriy Zaporozhets | 2016-01-30 | 11 | -9/+44 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | Update CHANGELOGbackground-delete-process | Josh Frye | 2016-01-29 | 3 | -8/+6 |
| * | | | | | | | First pass at deleting projects in the background. | Josh Frye | 2016-01-29 | 11 | -12/+49 |
* | | | | | | | | Merge branch 'warn-admin-oauth' into 'master' | Douwe Maan | 2016-01-30 | 2 | -1/+11 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | |