| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 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 |
| | * | | | Update omniauth-saml to 1.6.0 to address a security vulnerability in ruby-saml | Patricio Cano | 2016-06-27 | 2 | -6/+5 |
| * | | | | Merge branch 'mark-done-todo-id' into 'master' | Robert Speicher | 2016-06-27 | 1 | -1/+2 |
| |\ \ \ \ | |||||
| | * | | | | Correctly returns todo ID after creating todomark-done-todo-id | Phil Hughes | 2016-06-27 | 1 | -1/+2 |
| * | | | | | Merge branch '19075-new-wiki' into 'master' | Fatih Acet | 2016-06-27 | 2 | -3/+5 |
| |\ \ \ \ \ | |||||
| | * | | | | | Removed duplicate Changelog entries | Annabel Dunstone | 2016-06-27 | 1 | -12/+0 |
| | * | | | | | Add conditional for new pag link | Annabel Dunstone | 2016-06-27 | 1 | -0/+4 |
| | * | | | | | Update changelog | Annabel Dunstone | 2016-06-27 | 1 | -0/+13 |
| | * | | | | | Remove duplicate new page btn from edit wiki | Annabel Dunstone | 2016-06-27 | 1 | -3/+0 |
| * | | | | | | Merge branch 'workhorse-gmake' into 'master' | Stan Hu | 2016-06-27 | 1 | -0/+4 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Mention gmake | Jacob Vosmaer | 2016-06-27 | 1 | -0/+4 |
| * | | | | | | | Merge branch 'new-branch-check-fix' into 'master' | Fatih Acet | 2016-06-27 | 2 | -1/+2 |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| | * | | | | | | Fix check for existence of new branch button (!4630) | winniehell | 2016-06-27 | 2 | -1/+2 |
| | | |/ / / / | |/| | | | | |||||
| * | | | | | | Merge branch 'revert-sri' into 'master' | Jacob Schatz | 2016-06-27 | 3 | -5/+4 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| | * | | | | | Revert Subresource Integrity pending a fix for Firefox's incorrect hashing im...revert-sri | Connor Shea | 2016-06-27 | 3 | -5/+4 |
| | |/ / / / | |||||
| * | | | | | Merge branch 'fix/sidekiq-mem-killer-debug' into 'master' | Rémy Coutable | 2016-06-27 | 1 | -2/+2 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/sidekiq-mem... | James Lopez | 2016-06-27 | 95 | -292/+1546 |
| | |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | | better debugging for memory killer middlewarefix/sidekiq-mem-killer-debug | James Lopez | 2016-06-27 | 1 | -2/+2 |
| * | | | | | | Merge branch 'image-sizing' into 'master' | Rémy Coutable | 2016-06-27 | 7 | -2/+19 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| | * | | | | | Wrap images in divs with Banzai and limit max-height.image-sizing | Connor Shea | 2016-06-27 | 7 | -2/+19 |
| * | | | | | | Merge branch 'test-gitlab-ci-ymls' into 'master' | Rémy Coutable | 2016-06-27 | 1 | -0/+12 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Test templates and GitLabCI parser againts each othertest-gitlab-ci-ymls | Z.J. van de Weg | 2016-06-27 | 1 | -0/+12 |
| | | |/ / / / | |/| | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |