summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Enable the EmptyRule SCSS Linter.Connor Shea2016-04-164-12/+0
* Merge branch 'issues-mobile-header' into 'master' Jacob Schatz2016-04-169-156/+149
|\
| * Updated some if statementsissues-mobile-headerPhil Hughes2016-04-162-43/+40
| * Fixed testsPhil Hughes2016-04-162-5/+5
| * Fixed up based on feedbackPhil Hughes2016-04-163-10/+8
| * Alignment with sidebarPhil Hughes2016-04-161-1/+1
| * Moved meta information into an issuable helper methodPhil Hughes2016-04-163-17/+14
| * Merge request header markup now matches issue markup for consistancyPhil Hughes2016-04-162-34/+41
| * Refactored issue header to work better for mobilePhil Hughes2016-04-166-111/+105
* | Merge branch 'fivehundred_on_ui_help' into 'master' Dmitriy Zaporozhets2016-04-162-6/+7
|\ \ | |/ |/|
| * Simplify random user generation.Jacob Schatz2016-04-162-12/+7
| * Make a user available for the user variablefivehundred_on_ui_helpJacob Schatz2016-04-162-6/+12
* | Merge branch 'issue_14423' into 'master' Jacob Schatz2016-04-162-33/+73
|\ \ | |/ |/|
| * Memoize targetAlfredo Sumaran2016-04-161-22/+20
| * Change variable nameAlfredo Sumaran2016-04-161-3/+3
| * Fixes failing specAlfredo Sumaran2016-04-161-0/+2
| * Fixes multiple ajax request and incorrect data being set for the current issu...Alfredo Sumaran2016-04-161-16/+47
| * Update method name and remove unneeded paramsAlfredo Sumaran2016-04-161-2/+2
| * Put owner and participating people firstAlfredo Sumaran2016-04-161-15/+24
* | Merge branch 'gcovr' into 'master' Kamil Trzciński2016-04-161-0/+3
|\ \ | |/ |/|
| * Add test coverage parsing example for gcvorChristoph Junghans2016-04-091-0/+3
* | Merge branch 'rs-branch-name-space' into 'master' Jacob Schatz2016-04-151-2/+1
|\ \
| * | Remove extra spacing from merge request target branch namers-branch-name-spaceRobert Speicher2016-04-151-2/+1
* | | Merge branch 'fix/project-import_url' into 'master' Robert Speicher2016-04-152-1/+42
|\ \ \ | |/ / |/| |
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-imp...James Lopez2016-04-1528-55/+316
| |\ \
| * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-imp...James Lopez2016-04-14184-1071/+1638
| |\ \ \
| * | | | changed a few things based on feedbackJames Lopez2016-04-111-2/+6
| * | | | fix create_or_update_import_dataJames Lopez2016-04-071-1/+4
| * | | | refactored create_or_update_import_dataJames Lopez2016-04-071-16/+7
| * | | | refactored a few things based on MR feedbackJames Lopez2016-04-071-0/+13
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-imp...James Lopez2016-04-0749-356/+597
| |\ \ \ \
| * | | | | removed TODO [ci skip]James Lopez2016-04-061-1/+0
| * | | | | fix some issues with credentialsJames Lopez2016-04-061-2/+2
| * | | | | some refactoring to symbolise keys across importers and left a TODOJames Lopez2016-04-051-2/+6
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-imp...James Lopez2016-04-0515-50/+78
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-imp...James Lopez2016-04-04119-784/+1830
| |\ \ \ \ \ \
| * | | | | | | fix github import issuesJames Lopez2016-04-011-1/+1
| * | | | | | | fix fogbugz importJames Lopez2016-04-011-0/+4
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-imp...James Lopez2016-03-2877-334/+817
| |\ \ \ \ \ \ \
| * | | | | | | | first round of fixes and spec fixesJames Lopez2016-03-221-2/+3
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-imp...James Lopez2016-03-22109-518/+664
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-imp...James Lopez2016-03-2154-111/+347
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix import data creationJames Lopez2016-03-211-2/+1
| * | | | | | | | | | refactored code based on feedbackJames Lopez2016-03-211-2/+8
| * | | | | | | | | | fixed some rubocop warningsJames Lopez2016-03-211-1/+1
| * | | | | | | | | | fixed few issues with the migrationJames Lopez2016-03-212-2/+3
| * | | | | | | | | | more refactoringJames Lopez2016-03-211-4/+8
| * | | | | | | | | | some refactoring based on feedbackJames Lopez2016-03-211-0/+12
| * | | | | | | | | | Merge branches 'fix/project-import_url' and 'master' of gitlab.com:gitlab-org...James Lopez2016-03-21405-3792/+6725
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | refactored a bunch of stuff based on MR feedbackJames Lopez2016-03-071-1/+1
View Lorry Controller Status