summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nav-over-content-mobile' into 'master' Jacob Schatz2016-03-145-43/+66
|\
| * Removed call to setup from breakpoint size methodnav-over-content-mobilePhil Hughes2016-03-141-5/+5
| * Changed breakpoint sizePhil Hughes2016-03-145-28/+34
| * removed un-used function callPhil Hughes2016-03-141-3/+3
| * Created bootstrap breakpoint classPhil Hughes2016-03-145-37/+41
| * changed jquery document readyPhil Hughes2016-03-141-1/+1
| * Removed deprecated bootstrap variablesPhil Hughes2016-03-141-2/+2
| * Left sidebar overlaps the content on mobile devicesPhil Hughes2016-03-143-11/+24
* | Merge branch 'rs-note-active-spec' into 'master'Robert Speicher2016-03-141-12/+21
|\ \
| * | Add unit specs for `Note#active?`rs-note-active-specRobert Speicher2016-03-111-12/+21
* | | Merge branch 'updated-project-home-icon' into 'master' Jacob Schatz2016-03-141-1/+1
|\ \ \
| * | | Changed project home iconPhil Hughes2016-03-141-1/+1
* | | | Merge branch 'share-project-ce' into 'master' Dmitriy Zaporozhets2016-03-1418-4/+249
|\ \ \ \ | |/ / / |/| | |
| * | | Render project members from shared groupDmitriy Zaporozhets2016-03-123-0/+25
| * | | Add share project from group lockDmitriy Zaporozhets2016-03-113-3/+11
| * | | Add finders logic and tests for shared projects featureDmitriy Zaporozhets2016-03-113-2/+20
| * | | Allow users to access project shared with their groupDmitriy Zaporozhets2016-03-111-1/+51
| * | | Show shared projects on group pageDmitriy Zaporozhets2016-03-113-0/+27
| * | | Add functionality to setup share of project with group via project settingsDmitriy Zaporozhets2016-03-115-0/+77
| * | | Bring ProjectGroupLink model and migrations from EEDmitriy Zaporozhets2016-03-113-0/+40
* | | | Fixed tests for MR & issue filtersissue-filter-testsPhil Hughes2016-03-142-2/+4
| |_|/ |/| |
* | | Merge branch 'improve-issues-filter-all-spec' into 'master' Dmitriy Zaporozhets2016-03-141-1/+1
|\ \ \
| * | | Use Capybara find methods and remove sleeps in feature specs in "All Issues" ...improve-issues-filter-all-specStan Hu2016-03-131-1/+1
* | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2016-03-143-21/+17
|\ \ \ \
| * | | | Fix denting and specZeger-Jan van de Weg2016-03-131-1/+1
| * | | | ContinueToParams -> ContinueParamsZeger-Jan van de Weg2016-03-133-4/+4
| * | | | Check redirect path in the continue_paramsZeger-Jan van de Weg2016-03-133-21/+17
* | | | | Merge branch 'upcoming' into 'master' Douwe Maan2016-03-133-0/+13
|\ \ \ \ \
| * | | | | fixes small issuestiagonbotelho2016-03-131-2/+2
| * | | | | fixes issuestiagonbotelho2016-03-122-5/+4
| * | | | | fixes issues for mr acceptancetiagonbotelho2016-03-122-8/+12
| * | | | | implements upcoming filter in milstonestiagonbotelho2016-03-123-0/+10
| | |/ / / | |/| | |
* | | | | Revert "Revert "Merge branch 'support-go-subpackages' into 'master' ""Stan Hu2016-03-122-16/+0
|/ / / /
* | | | Revert "Merge branch 'support-go-subpackages' into 'master' "Douwe Maan2016-03-122-0/+16
* | | | Merge branch 'support-go-subpackages' into 'master' Douwe Maan2016-03-122-16/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove existing go_import.html.haml implementationStan Hu2016-03-122-16/+0
* | | | Merge branch 'projects-finder-ee-compatible' into 'master' Dmitriy Zaporozhets2016-03-122-7/+4
|\ \ \ \
| * | | | Removed User#project_relationsprojects-finder-ee-compatibleYorick Peterse2016-03-122-7/+4
* | | | | Merge branch 'rs-disallow-blank-line-code' into 'master' Douwe Maan2016-03-121-1/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Disallow blank (non-null) values for a Note's `line_code` attributers-disallow-blank-line-codeRobert Speicher2016-03-111-1/+6
* | | | | Merge branch 'fix/token-timing-attack' into 'master' Douwe Maan2016-03-122-3/+3
|\ \ \ \ \
| * | | | | add SHA256 to secure_comparefix/token-timing-attackJames Lopez2016-03-082-3/+3
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/token-timin...James Lopez2016-03-08185-1704/+2045
| |\ \ \ \ \
| * | | | | | fix token issue - timing attackJames Lopez2016-03-022-3/+3
* | | | | | | Merge branch 'nico-de-ceulaer/gitlab-ce-13865-handle-other-emails-for-avatar-...Douwe Maan2016-03-121-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | ensure also alternative email addresses are used when looking up usernico de ceulaer2016-03-031-1/+1
* | | | | | | Merge branch 'fix_responsive_layout_bug' into 'master' Jacob Schatz2016-03-111-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fix responsive bug top navigationDennis van de Hoef2016-03-111-1/+1
* | | | | | | Use a UNION in MergeRequest.in_projectsYorick Peterse2016-03-111-1/+18
* | | | | | | Make Namespace.search case-insensitiveYorick Peterse2016-03-111-1/+11