Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | 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 | |
* | | | | | | | | | | | Merge branch 'regex-find-replace-http-matcher' into 'master' | Robert Speicher | 2016-06-27 | 67 | -1015/+1015 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Use HTTP matchers if possible | Z.J. van de Weg | 2016-06-27 | 67 | -1015/+1015 | |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'cherry-pick-5734e266' into 'master' | Robert Speicher | 2016-06-27 | 2 | -1/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Update CHANGELOG | Douwe Maan | 2016-06-27 | 1 | -0/+1 | |
| * | | | | | | | | | | Fix rendering of commit notes | Douwe Maan | 2016-06-27 | 1 | -1/+8 | |
* | | | | | | | | | | | Merge branch 'emoji-menu-stick-search' into 'master' | Jacob Schatz | 2016-06-27 | 6 | -19/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Updated award emoji testsemoji-menu-stick-search | Phil Hughes | 2016-06-24 | 1 | -3/+1 | |
| * | | | | | | | | | | Fixed award emoji tests | Phil Hughes | 2016-06-20 | 2 | -2/+1 | |
| * | | | | | | | | | | Made the search bar on emoji menu sticky | Phil Hughes | 2016-06-20 | 3 | -14/+15 | |
* | | | | | | | | | | | Merge branch 'update-omniauth-saml' into 'master' | Stan Hu | 2016-06-27 | 3 | -6/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Updated CHANGELOG | Patricio Cano | 2016-06-27 | 1 | -0/+3 |