summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fix build errorsKamil Trzcinski2016-02-032-4/+8
* Clean Ci::ApplicationController from unused permission related codeKamil Trzcinski2016-02-032-50/+2
* Add CI setting: allow_guest_to_access_buildsKamil Trzcinski2016-02-023-8/+15
* Make the CI permission model simplerKamil Trzcinski2016-02-0215-52/+48
* Allow manual resize of js-autosize textareasrs-relax-autosizeRobert Speicher2016-02-013-3/+21
* Merge branch 'merge-request-closes-issues-performance' into 'master'Robert Speicher2016-02-011-4/+4
|\
| * Optimize fetching issues closed by a merge requestmerge-request-closes-issues-performanceYorick Peterse2016-02-011-4/+4
* | Render sanitized SVG imagesStan Hu2016-02-012-1/+16
* | Make "Two-factor" casing consistent throughout the applicationrs-two-factor-casingRobert Speicher2016-01-312-4/+4
* | Merge branch 'rename-inline-diff' into 'master' Robert Speicher2016-01-314-11/+50
|\ \
| * | Fewer html_safesrename-inline-diffDouwe Maan2016-01-301-2/+2
| * | Mark inline difference between old and new paths when a file is renamedDouwe Maan2016-01-294-11/+50
* | | Merge branch 'rs-issue-12706' into 'master' Douwe Maan2016-01-302-5/+5
|\ \ \
| * | | Increase the minimum length for commit SHA matching to 7rs-issue-12706Robert Speicher2016-01-292-5/+5
* | | | Merge branch 'cache-broadcast-message-current' into 'master' Dmitriy Zaporozhets2016-01-301-1/+3
|\ \ \ \
| * | | | Change ttl to 1 minutecache-broadcast-message-currentJosh Frye2016-01-291-1/+1
| * | | | Cache BroadcastMessage.current for 5 minutes. Fixes #12770Josh Frye2016-01-291-1/+3
| |/ / /
* | | | Merge remote-tracking branch 'origin/background-delete-process'Dmitriy Zaporozhets2016-01-306-4/+32
|\ \ \ \
| * | | | First pass at deleting projects in the background.Josh Frye2016-01-296-4/+32
* | | | | Merge branch 'warn-admin-oauth' into 'master' Douwe Maan2016-01-301-1/+10
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Improve text on warning messageZeger-Jan van de Weg2016-01-261-1/+3
| * | | | Warn admin of granting admin rights during OAuthZeger-Jan van de Weg2016-01-261-1/+8
* | | | | Fix old version warning when viewing wiki latest version via version_idfix-viewing-wiki-page-lastest-version-via-version-idDouglas Barbosa Alexandre2016-01-291-1/+1
* | | | | Merge branch 'focus-emoji-search-field' into 'master' Jacob Schatz2016-01-292-1/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Auto-focus emoji award search fieldPhil Hughes2016-01-292-1/+2
* | | | | Merge branch 'note-background-job' into 'master' Dmitriy Zaporozhets2016-01-294-18/+45
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | [WIP] Background process note logic for #3948Josh Frye2016-01-284-18/+45
* | | | | Merge branch 'rs-remove-ip-blocking' into 'master' Dmitriy Zaporozhets2016-01-294-25/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Partially revert "Add IP check against DNSBLs at account sign-up"rs-remove-ip-blockingRobert Speicher2016-01-284-25/+0
* | | | | Merge branch 'hotfix/ruby-21-broken-update' into 'master' Marin Jankovski2016-01-292-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into hotfix/ruby-21-...James Lopez2016-01-2825-29/+194
| |\ \ \ \ | | |/ / /
| * | | | trick rubocop and temporarily add ruby 2.1 images for any branchJames Lopez2016-01-282-2/+2
| | |_|/ | |/| |
* | | | Merge branch 'mr-merge-base' into 'master' Robert Speicher2016-01-285-21/+22
|\ \ \ \
| * \ \ \ Merge branch 'master' into mr-merge-basemr-merge-baseDouwe Maan2016-01-2821-36/+39
| |\ \ \ \
| * | | | | Fix specsDouwe Maan2016-01-283-3/+6
| * | | | | Correctly determine MR diff base when MR has merge conflictsDouwe Maan2016-01-274-20/+18
* | | | | | Merge branch 'highlight-blame' into 'master' Robert Speicher2016-01-282-29/+5
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into highlight-blameDouwe Maan2016-01-2821-36/+39
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Move blame group logic to dedicated classDouwe Maan2016-01-282-29/+3
| * | | | | | Fix highlighting in blame view.Douwe Maan2016-01-272-4/+6
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'rs-ldap-user' into 'master' Robert Speicher2016-01-281-7/+8
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Backport LDAP user assignment changes from EERobert Speicher2016-01-281-7/+8
| | |_|/ / | |/| | |
* | | | | Merge branch 'issue_2406' into 'master' Dmitriy Zaporozhets2016-01-2813-18/+159
|\ \ \ \ \
| * | | | | Align filter dropdown.issue_2406Rubén Dávila2016-01-271-0/+4
| * | | | | Remove no longer required CSS rule.Rubén Dávila2016-01-201-4/+0
| * | | | | Refactor some CSS rules.Rubén Dávila2016-01-202-6/+17
| * | | | | Some fixes from last code review.Rubén Dávila2016-01-204-5/+5
| * | | | | Some CSS and sorting fixes.Rubén Dávila2016-01-203-19/+30
| * | | | | Add icon for private forks notice. #2406Rubén Dávila2016-01-203-2/+16
| * | | | | Add ability to sort forks. #2406Rubén Dávila2016-01-202-4/+7
View Lorry Controller Status