summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Partially revert "Add IP check against DNSBLs at account sign-up"rs-remove-ip-blockingRobert Speicher2016-01-2810-235/+8
* Merge branch 'mr-merge-base' into 'master' Robert Speicher2016-01-287-22/+24
|\
| * Merge branch 'master' into mr-merge-basemr-merge-baseDouwe Maan2016-01-2845-95/+147
| |\
| * | Fix specsDouwe Maan2016-01-284-4/+7
| * | Correctly determine MR diff base when MR has merge conflictsDouwe Maan2016-01-275-22/+19
* | | Merge branch 'highlight-blame' into 'master' Robert Speicher2016-01-286-43/+84
|\ \ \
| * | | Fix changeloghighlight-blameDouwe Maan2016-01-281-3/+1
| * | | Merge branch 'master' into highlight-blameDouwe Maan2016-01-2845-95/+147
| |\ \ \ | | | |/ | | |/|
| * | | Move blame group logic to dedicated classDouwe Maan2016-01-285-43/+81
| * | | Fix highlighting in blame view.Douwe Maan2016-01-273-4/+7
| | |/ | |/|
* | | 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 'update_sentry_gem' into 'master' Robert Speicher2016-01-281-1/+1
|\ \ \ \
| * | | | Update sentry-raven gem.update_sentry_gemMarin Jankovski2016-01-281-1/+1
| |/ / /
* | | | Merge branch 'issue_2406' into 'master' Dmitriy Zaporozhets2016-01-2818-22/+205
|\ \ \ \
| * | | | 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
| * | | | Fix broken spec.Rubén Dávila2016-01-201-1/+3
| * | | | Add specs for Forks listing.Rubén Dávila2016-01-202-0/+40
| * | | | 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
| * | | | aligns menu at top on one rowJacob Schatz2016-01-202-10/+26
| * | | | changing projects cssJacob Schatz2016-01-201-1/+0
| * | | | WIP: Add sort dropdown. #2406Rubén Dávila2016-01-201-0/+20
| * | | | Little update to copy and custom content for empty results. #2406Rubén Dávila2016-01-201-8/+13
| * | | | Show last commit as description. #2406Rubén Dávila2016-01-203-4/+10
| * | | | Fix broken specs. #2406Rubén Dávila2016-01-202-6/+4
| * | | | Add ability to filter by namespace. #2406Rubén Dávila2016-01-202-12/+20
| * | | | Use adequate icon for Forks link on sidebar. #2406Rubén Dávila2016-01-201-1/+1
| * | | | Show forks counter on listing. #2406Rubén Dávila2016-01-203-2/+10
| * | | | Add fork button and implement ability to distinguish between public and prote...Rubén Dávila2016-01-202-2/+26
| * | | | Use Project creator's avatar in fork listing. #2406Rubén Dávila2016-01-205-4/+12
| * | | | Setup new fork link in sidebar and routes. #2406Rubén Dávila2016-01-209-10/+20
* | | | | Merge branch 'issue_5546' into 'master' Dmitriy Zaporozhets2016-01-287-2/+111
|\ \ \ \ \
| * | | | | Make default sorting preference work for Issues and MRs.issue_5546Rubén Dávila2016-01-223-4/+16
| * | | | | Merge branch 'master' into issue_5546Rubén Dávila2016-01-22167-958/+2863
| |\ \ \ \ \
| * | | | | | Make sorting preference reusable for all projects.Rubén Dávila2016-01-228-14/+43
| * | | | | | Make cookie suffix more simpler.Rubén Dávila2016-01-211-2/+2
| * | | | | | Little refactor plus some specs.Rubén Dávila2016-01-216-12/+52
| * | | | | | Remember last sort option used.Rubén Dávila2016-01-205-2/+30
* | | | | | | Merge branch 'fix-preventing-migration-from-crashing-in-specific-cases' into ...Dmitriy Zaporozhets2016-01-282-12/+20
|\ \ \ \ \ \ \
| * | | | | | | Use ActiveRecord::Base.connection.active? and rescue any exception in connect...fix-preventing-migration-from-crashing-in-specific-casesRémy Coutable2016-01-281-1/+4
| * | | | | | | Only create the defaults ApplicationSetting when DB is fully migratedRémy Coutable2016-01-281-19/+16
| * | | | | | | Ensure rake tasks that don't need a DB connection can be run without oneRémy Coutable2016-01-262-1/+2
| * | | | | | | Fix preventing migration from crashing in very specific casesRémy Coutable2016-01-251-0/+7
* | | | | | | | Merge branch 'improve-mr-api' into 'master' Dmitriy Zaporozhets2016-01-284-268/+221
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve consistency and duplication for Merge Request APIimprove-mr-apiDmitriy Zaporozhets2016-01-284-268/+221
| | |_|_|_|/ / / | |/| | | | | |