summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Better caching of git calls on ProjectsController#show18709-projects-show-git-callsPaco Guzman2016-06-281-0/+1
* Cache git head_unborn? callPaco Guzman2016-06-282-1/+58
* :expire_gitignore is not explicitly call anymorePaco Guzman2016-06-281-4/+0
* Avoid instantiation of a Git::TreePaco Guzman2016-06-281-1/+6
* Expire branch/tag git data when needed.Paco Guzman2016-06-284-9/+83
* Merge branch 'gitlab_architecture' into 'master' Achilleas Pipinellis2016-06-283-1/+3
|\
| * Add "GitLab team members only" to diagram linkgitlab_architectureChris Wilson2016-06-281-1/+1
| * Update GitLab architecture diagram, include Google draw linkChris Wilson2016-06-232-0/+2
| * Replace GitLab architecture diagramAchilleas Pipinellis2016-04-133-1/+1
* | Merge branch 'display-deleted-ref-in-events' into 'master' Rémy Coutable2016-06-283-9/+19
|\ \
| * | Display last commit of deleted branch in push events (!4699)winniehell2016-06-283-9/+19
* | | Merge branch 'fix/attr-encrypted-issue' into 'master' Rémy Coutable2016-06-284-0/+6
|\ \ \
| * | | add changelogJames Lopez2016-06-281-0/+3
| * | | add missing attribute to attr_encrypted so it is fully backwards-compatibleJames Lopez2016-06-283-0/+3
* | | | Merge branch 'feature/custom-highlighting' into 'master' Rémy Coutable2016-06-2810-12/+101
|\ \ \ \ | |/ / / |/| | |
| * | | doc: note that .gitattributes uses default branchfeature/custom-highlightinghttp://jneen.net/2016-06-271-0/+2
| * | | use the conf lexer so we have highlighted commentshttp://jneen.net/2016-06-271-1/+1
| * | | first draft of docshttp://jneen.net/2016-06-271-0/+29
| * | | support cgi style options, such as erb?parent=jsonhttp://jneen.net/2016-06-273-7/+18
| * | | move the path alias to a more appropriate locationhttp://jneen.net/2016-06-271-5/+5
| * | | make #custom_language privatehttp://jneen.net/2016-06-271-8/+8
| * | | appease rubocophttp://jneen.net/2016-06-271-2/+1
| * | | add an alias for Snippet#pathhttp://jneen.net/2016-06-271-0/+6
| * | | appease rubocophttp://jneen.net/2016-06-271-2/+2
| * | | check the tag so that an instance will pass toohttp://jneen.net/2016-06-271-1/+1
| * | | fix the spec, using project.change_headhttp://jneen.net/2016-06-272-3/+10
| * | | Revert "bump the master sha for gitlab-test!9"http://jneen.net/2016-06-271-1/+1
| * | | bump the master sha for gitlab-test!9http://jneen.net/2016-06-271-1/+1
| * | | add custom highlighting via .gitattributeshttp://jneen.net/2016-06-277-12/+47
* | | | Merge remote-tracking branch 'dev/master'Robert Speicher2016-06-2710-9/+154
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'fix-18997' into 'master' Robert Speicher2016-06-274-2/+113
| |\ \ \
| | * | | Update CHANGELOGDouglas Barbosa Alexandre2016-06-221-0/+3
| | * | | Fix visibility of private project snippets for members when searchingDouglas Barbosa Alexandre2016-06-223-20/+68
| | * | | Fix internal snippets can be searched by anyoneDouglas Barbosa Alexandre2016-06-223-2/+62
| * | | | Merge branch '19102-fix' into 'master' Robert Speicher2016-06-276-6/+42
| |\ \ \ \
| | * | | | Fix an information disclosure when requesting access to a group containing pr...Rémy Coutable2016-06-246-6/+42
| | | |/ / | | |/| |
* | | | | Merge branch 'rename_license_template_api' into 'master' Robert Speicher2016-06-273-4/+4
|\ \ \ \ \
| * | | | | Rename Licenses API to License Templates APIDrew Blessing2016-06-273-4/+4
|/ / / / /
* | | | | Merge branch 'issue_18398' into 'master' Douwe Maan2016-06-273-0/+33
|\ \ \ \ \
| * | | | | Check for conflict with wiki projects when creating a new project.issue_18398Ruben Davila2016-06-273-0/+33
* | | | | | Merge branch 'regex-find-replace-http-matcher' into 'master' Robert Speicher2016-06-2767-1015/+1015
|\ \ \ \ \ \
| * | | | | | Use HTTP matchers if possibleZ.J. van de Weg2016-06-2767-1015/+1015
* | | | | | | Merge branch 'cherry-pick-5734e266' into 'master' Robert Speicher2016-06-272-1/+9
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Update CHANGELOGDouwe Maan2016-06-271-0/+1
| * | | | | | Fix rendering of commit notesDouwe Maan2016-06-271-1/+8
* | | | | | | Merge branch 'emoji-menu-stick-search' into 'master' Jacob Schatz2016-06-276-19/+17
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Updated award emoji testsemoji-menu-stick-searchPhil Hughes2016-06-241-3/+1
| * | | | | | Fixed award emoji testsPhil Hughes2016-06-202-2/+1
| * | | | | | Made the search bar on emoji menu stickyPhil Hughes2016-06-203-14/+15
* | | | | | | Merge branch 'update-omniauth-saml' into 'master' Stan Hu2016-06-273-6/+8
|\ \ \ \ \ \ \