Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix CHANGELOGas-fix-changelog | Alfredo Sumaran | 2016-06-28 | 1 | -1/+0 |
* | Merge branch 'remove-gon-variable' into 'master' | Fatih Acet | 2016-06-28 | 2 | -1/+1 |
|\ | |||||
| * | Unused got variable with very bad performance | Paco Guzman | 2016-06-28 | 2 | -1/+1 |
* | | Merge branch 'iankelling-api-doc' into 'master' | Achilleas Pipinellis | 2016-06-28 | 1 | -1/+1 |
|\ \ | |||||
| * | | docs: fix default_branch_protection default | Ian Kelling | 2016-06-05 | 1 | -1/+1 |
* | | | Merge branch '19170-mobile-buttons' into 'master' | Dmitriy Zaporozhets | 2016-06-28 | 9 | -15/+15 |
|\ \ \ | |||||
| * | | | Update CHANGELOG | Alfredo Sumaran | 2016-06-28 | 1 | -3/+2 |
| * | | | Switched mobile button icons to ellipsis and angle | Annabel Dunstone | 2016-06-28 | 9 | -15/+16 |
|/ / / | |||||
* | | | Merge branch '19171-pinned-width' into 'master' | Dmitriy Zaporozhets | 2016-06-28 | 3 | -2/+3 |
|\ \ \ | |||||
| * | | | Update CHANGELOG19171-pinned-width | Annabel Dunstone | 2016-06-28 | 1 | -0/+1 |
| * | | | Decreased window min width for pinned sidebar | Annabel Dunstone | 2016-06-28 | 2 | -2/+2 |
| | |/ | |/| | |||||
* | | | Merge branch 'use-git-depth' into 'master' | Kamil Trzciński | 2016-06-28 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Use GIT_DEPTH when running buildsuse-git-depth | Kamil Trzcinski | 2016-06-17 | 1 | -0/+1 |
* | | | | Merge branch 'add-smtp-upgrade-info' into 'master' | Achilleas Pipinellis | 2016-06-28 | 1 | -0/+13 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Add SMTP upgrade information | Stan Hu | 2016-06-28 | 1 | -0/+13 |
* | | | | Merge branch 'gitlab_architecture' into 'master' | Achilleas Pipinellis | 2016-06-28 | 3 | -1/+3 |
|\ \ \ \ | |||||
| * | | | | Add "GitLab team members only" to diagram linkgitlab_architecture | Chris Wilson | 2016-06-28 | 1 | -1/+1 |
| * | | | | Update GitLab architecture diagram, include Google draw link | Chris Wilson | 2016-06-23 | 2 | -0/+2 |
| * | | | | Replace GitLab architecture diagram | Achilleas Pipinellis | 2016-04-13 | 3 | -1/+1 |
* | | | | | Merge branch 'display-deleted-ref-in-events' into 'master' | Rémy Coutable | 2016-06-28 | 3 | -9/+19 |
|\ \ \ \ \ | |||||
| * | | | | | Display last commit of deleted branch in push events (!4699) | winniehell | 2016-06-28 | 3 | -9/+19 |
* | | | | | | Merge branch 'fix/attr-encrypted-issue' into 'master' | Rémy Coutable | 2016-06-28 | 4 | -0/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add changelog | James Lopez | 2016-06-28 | 1 | -0/+3 |
| * | | | | | | add missing attribute to attr_encrypted so it is fully backwards-compatible | James Lopez | 2016-06-28 | 3 | -0/+3 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'feature/custom-highlighting' into 'master' | Rémy Coutable | 2016-06-28 | 10 | -12/+101 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | doc: note that .gitattributes uses default branchfeature/custom-highlighting | http://jneen.net/ | 2016-06-27 | 1 | -0/+2 |
| * | | | | | use the conf lexer so we have highlighted comments | http://jneen.net/ | 2016-06-27 | 1 | -1/+1 |
| * | | | | | first draft of docs | http://jneen.net/ | 2016-06-27 | 1 | -0/+29 |
| * | | | | | support cgi style options, such as erb?parent=json | http://jneen.net/ | 2016-06-27 | 3 | -7/+18 |
| * | | | | | move the path alias to a more appropriate location | http://jneen.net/ | 2016-06-27 | 1 | -5/+5 |
| * | | | | | make #custom_language private | http://jneen.net/ | 2016-06-27 | 1 | -8/+8 |
| * | | | | | appease rubocop | http://jneen.net/ | 2016-06-27 | 1 | -2/+1 |
| * | | | | | add an alias for Snippet#path | http://jneen.net/ | 2016-06-27 | 1 | -0/+6 |
| * | | | | | appease rubocop | http://jneen.net/ | 2016-06-27 | 1 | -2/+2 |
| * | | | | | check the tag so that an instance will pass too | http://jneen.net/ | 2016-06-27 | 1 | -1/+1 |
| * | | | | | fix the spec, using project.change_head | http://jneen.net/ | 2016-06-27 | 2 | -3/+10 |
| * | | | | | Revert "bump the master sha for gitlab-test!9" | http://jneen.net/ | 2016-06-27 | 1 | -1/+1 |
| * | | | | | bump the master sha for gitlab-test!9 | http://jneen.net/ | 2016-06-27 | 1 | -1/+1 |
| * | | | | | add custom highlighting via .gitattributes | http://jneen.net/ | 2016-06-27 | 7 | -12/+47 |
* | | | | | | Merge remote-tracking branch 'dev/master' | Robert Speicher | 2016-06-27 | 10 | -9/+154 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Merge branch 'fix-18997' into 'master' | Robert Speicher | 2016-06-27 | 4 | -2/+113 |
| |\ \ \ \ \ | |||||
| | * | | | | | Update CHANGELOG | Douglas Barbosa Alexandre | 2016-06-22 | 1 | -0/+3 |
| | * | | | | | Fix visibility of private project snippets for members when searching | Douglas Barbosa Alexandre | 2016-06-22 | 3 | -20/+68 |
| | * | | | | | Fix internal snippets can be searched by anyone | Douglas Barbosa Alexandre | 2016-06-22 | 3 | -2/+62 |
| * | | | | | | Merge branch '19102-fix' into 'master' | Robert Speicher | 2016-06-27 | 6 | -6/+42 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix an information disclosure when requesting access to a group containing pr... | Rémy Coutable | 2016-06-24 | 6 | -6/+42 |
| | | |/ / / / | | |/| | | | | |||||
* | | | | | | | Merge branch 'rename_license_template_api' into 'master' | Robert Speicher | 2016-06-27 | 3 | -4/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Rename Licenses API to License Templates API | Drew Blessing | 2016-06-27 | 3 | -4/+4 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'issue_18398' into 'master' | Douwe Maan | 2016-06-27 | 3 | -0/+33 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Check for conflict with wiki projects when creating a new project.issue_18398 | Ruben Davila | 2016-06-27 | 3 | -0/+33 |