summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Clarify that the diff view setting always comes from the cookiers-diff_viewRobert Speicher2016-04-191-2/+1
* Always read diff_view setting from the cookieRobert Speicher2016-04-142-2/+8
* Merge branch '14176-diff-paste-data' into 'master' Jacob Schatz2016-04-146-30/+61
|\
| * Syntax & style updates14176-diff-paste-dataAnnabel Dunstone2016-04-145-29/+31
| * Add line type conditional to diff line helperAnnabel Dunstone2016-04-144-11/+17
| * Add content attributes to discussion diffs; change styling of add-note icon t...Annabel Dunstone2016-04-144-22/+24
| * Copying and pasting doesn't grab line numbers or +/-Annabel Dunstone2016-04-144-6/+27
* | Merge branch 'rs-sentry-contexts' into 'master' Stan Hu2016-04-141-8/+10
|\ \
| * | Add Sentry program context even without a current userRobert Speicher2016-04-141-8/+10
* | | Merge branch 'subscribe-button-fix' into 'master' Jacob Schatz2016-04-145-11/+5
|\ \ \ | |/ / |/| |
| * | Fixed style issuessubscribe-button-fixPhil Hughes2016-04-141-1/+1
| * | Fixed haml style issuesPhil Hughes2016-04-141-1/+1
| * | Fixed issue with failing testsPhil Hughes2016-04-123-3/+3
| * | Removed references to subscribe-button CSS classPhil Hughes2016-04-125-11/+5
* | | Merge branch 'auto-fsck' into 'master' Robert Speicher2016-04-1414-5/+238
|\ \ \
| * | | Shut up, RubocopRobert Speicher2016-04-141-3/+3
| * | | Documentation / help improvementsJacob Vosmaer2016-04-141-1/+3
| * | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsckJacob Vosmaer2016-04-1362-368/+534
| |\ \ \
| * | | | Use more conservative limitsJacob Vosmaer2016-04-132-3/+3
| * | | | Clear repository check columns asynchronouslyJacob Vosmaer2016-04-137-102/+119
| * | | | Always check the wiki tooJacob Vosmaer2016-04-131-2/+3
| * | | | Make check result staleness more obviousJacob Vosmaer2016-04-131-1/+3
| * | | | More code changes, thanks RobertJacob Vosmaer2016-04-132-20/+24
| * | | | Changes suggested by RobertJacob Vosmaer2016-04-123-4/+2
| * | | | BastaJacob Vosmaer2016-04-122-2/+2
| * | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsckJacob Vosmaer2016-04-12154-901/+1458
| |\ \ \ \
| * | | | | Move 'clear checks' button to applicatoin settingsJacob Vosmaer2016-04-124-17/+20
| * | | | | Add a 'circuit breaker' for repo checksJacob Vosmaer2016-04-122-0/+21
| * | | | | Add repository_checks_enabled settingJacob Vosmaer2016-04-121-1/+2
| * | | | | Increase fsck lock timeout to 24 hoursJacob Vosmaer2016-04-121-1/+3
| * | | | | Rename almost all the thingsJacob Vosmaer2016-04-0611-44/+44
| * | | | | Rebase repo check MRJacob Vosmaer2016-04-0410-4/+186
* | | | | | Merge branch 'fix-group-projects-sort' into 'master' Robert Speicher2016-04-141-0/+1
|\ \ \ \ \ \
| * | | | | | Projects on group page should be sorted by last activity instead of id/create...fix-group-projects-sortDmitriy Zaporozhets2016-04-141-0/+1
* | | | | | | Merge branch 'connorshea/gitlab-ce-revoke-authorized-application' into 'master' Rémy Coutable2016-04-144-15/+23
|\ \ \ \ \ \ \
| * | | | | | | Include GonHelper separately and remove created_at in factoryStan Hu2016-04-142-0/+2
| * | | | | | | Add spec for deletion of authorized OAuth2 applicationStan Hu2016-04-143-14/+20
| * | | | | | | Fix the improper delete form being rendered for an oauth_authorized_applicationconnorshea2016-04-141-1/+1
* | | | | | | | Merge branch 'issue_15155' into 'master' Rémy Coutable2016-04-142-2/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Change transfer service to use existing methodsFelipe Artur2016-04-141-15/+3
| * | | | | | | Setup visibility level for project when transfering for a groupFelipe Artur2016-04-132-4/+18
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'start-with-iid-on-new-branch' into 'master' Rémy Coutable2016-04-143-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Start with iid on branch creationZeger-Jan van de Weg2016-04-143-4/+4
| | |/ / / / / | |/| | | | |
* | | | | | | Fixed issue with other links being clicked in diffsPhil Hughes2016-04-141-2/+2
* | | | | | | Correctly scrolls to the line when clickingPhil Hughes2016-04-141-2/+10
* | | | | | | Diff viewer links to correct part of the filePhil Hughes2016-04-147-8/+58
* | | | | | | Merge branch 'simplify-gitlab-url_builder-15202' into 'master' Rémy Coutable2016-04-144-9/+4
|\ \ \ \ \ \ \
| * | | | | | | Refactor and expose only Gitlab::UrlBuilder.build(record)simplify-gitlab-url_builder-15202Rémy Coutable2016-04-134-9/+4
* | | | | | | | Fixed scss syntax issuePhil Hughes2016-04-141-1/+1
* | | | | | | | Focus variable for dropzonePhil Hughes2016-04-142-1/+2