summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dz-improve-content-list' into 'master' Dmitriy Zaporozhets2016-08-044-17/+11
|\
| * Remove unnecessary empty line after css vardz-improve-content-listDmitriy Zaporozhets2016-08-041-1/+0
| * Set consistency in list text height cssDmitriy Zaporozhets2016-08-044-17/+12
* | Merge branch 'doc-artifacts-refactor' into 'master' Achilleas Pipinellis2016-08-041-1/+4
|\ \
| * | Refactor build artifacts documentationAchilleas Pipinellis2016-08-041-1/+4
* | | Merge branch '20512-fix-rename-add-users-into-project-to-add-users-to-project...Rémy Coutable2016-08-042-4/+4
|\ \ \ | |_|/ |/| |
| * | Fix Rename `add_users_into_project` and `projects_ids`Herminio Torres2016-08-042-4/+4
* | | Merge branch 'fix/ha-mode-import-issue' into 'master' Rémy Coutable2016-08-045-12/+32
|\ \ \ | |/ / |/| |
| * | using shared path for project import uploads and refactored gitlab remove exp...James Lopez2016-08-045-12/+32
* | | Merge branch 'devise-deprecations' into 'master' Rémy Coutable2016-08-044-4/+4
|\ \ \
| * | | Remove provider path, replace with dynamic path.devise-deprecationsConnor Shea2016-08-035-10/+4
| * | | Add an oauth provider path helper.Connor Shea2016-08-035-4/+10
* | | | Merge branch 'fix/confusing-blocked-user-description' into 'master' Achilleas Pipinellis2016-08-041-5/+3
|\ \ \ \
| * | | | Fix confusing description of a blocked user.Elias Werberich2016-08-021-5/+3
* | | | | Merge branch 'remove-unused-images' into 'master' Rémy Coutable2016-08-0410-0/+0
|\ \ \ \ \
| * | | | | Remove unused imagesClement Ho2016-08-0310-0/+0
* | | | | | Fix Mystery GuestHerminio Torres2016-08-042-3/+3
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'fix-project-destroy-skip-repo' into 'master' Robert Speicher2016-08-041-1/+1
|\ \ \ \ \
| * | | | | Fix skip_repo parameter being ignored when destroying a namespaceStan Hu2016-08-031-1/+1
* | | | | | change the API on the merge_request_diff model from diffs -> raw_diffsuse-raw-diffs-for-merge-request-diffsPaco Guzman2016-08-032-6/+6
|/ / / / /
* | | | | Use commit deltas when counting files in IrkerWorkerfix/speed-up-commit-repo-changesAhmad Sherif2016-08-031-1/+1
* | | | | Use only deltas in diffs when scanning the last commit for changes in the ava...Stan Hu2016-08-031-1/+1
* | | | | Speed up Commit#repo_changesAhmad Sherif2016-08-031-1/+1
|/ / / /
* | | | Merge branch '20034-safe-diffs' into 'master' Douwe Maan2016-08-0323-70/+146
|\ \ \ \
| * | | | Make Compare#diffs diff_options a regular argumentDouwe Maan2016-08-033-4/+4
| * | | | switch from diff_file_collection to diffs20034-safe-diffsPaco Guzman2016-08-0315-61/+55
| * | | | Introduce Compare model in the codebase.Paco Guzman2016-08-0314-46/+82
| * | | | Move to Gitlab::Diff::FileCollectionPaco Guzman2016-08-0318-151/+53
| * | | | Cache highlighted diff lines for merge requestsPaco Guzman2016-08-0321-30/+174
* | | | | Merge branch 'fix-filter-input-alignment' into 'master' Fatih Acet2016-08-031-2/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix filter input alignmentClement Ho2016-08-021-2/+0
* | | | | Merge branch 'discussion-reply-button-performance' into 'master' Jacob Schatz2016-08-032-3/+3
|\ \ \ \ \
| * | | | | Remove delay when hitting Reply... button on page with a lot of discussionsDouwe Maan2016-08-012-3/+3
| | |_|_|/ | |/| | |
* | | | | Merge branch 'convert-trans-bg-to-css' into 'master' Jacob Schatz2016-08-032-1/+4
|\ \ \ \ \
| * | | | | Convert image diff background image to CSSClement Ho2016-08-012-1/+4
* | | | | | Merge branch '18866-add-simple-identifier-to-public-ssh-keys' into 'master' Douwe Maan2016-08-021-2/+3
|\ \ \ \ \ \
| * | | | | | Add simple identifier to public SSH keysKeith Pope2016-08-021-2/+3
* | | | | | | Merge branch 'rs-external-issue-tracker-redirect' into 'master' Douwe Maan2016-08-025-35/+16
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Remove `url_for_new_issue` helperrs-external-issue-tracker-redirectRobert Speicher2016-08-013-20/+10
| * | | | | | Redirect to external issue tracker from `/issues`Robert Speicher2016-08-014-18/+9
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'convert-switch-icon-to-font' into 'master' Dmitriy Zaporozhets2016-08-023-3/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Convert switch icon into icon fontClement Ho2016-08-013-3/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'branches-ending-with-json' into 'master' Douwe Maan2016-08-021-1/+1
|\ \ \ \ \
| * | | | | Allow branch names ending with .json for graph and network page (!5579)winniehell2016-08-021-1/+1
| * | | | | Append .json onto graph request URL (!5136)Phil Hughes2016-08-021-1/+1
| | |/ / / | |/| | |
* | | | | Expand commit message width in repo viewClement Ho2016-08-023-7/+13
* | | | | Merge branch 'ff-artifacts-date-fix' into 'master' Fatih Acet2016-08-021-1/+1
|\ \ \ \ \
| * | | | | Fixed artifacts expire date in FFff-artifacts-date-fixPhil Hughes2016-07-271-1/+1
* | | | | | Merge branch '14202-speed-up-diff-note-active' into 'master' Yorick Peterse2016-08-026-3/+40
|\ \ \ \ \ \
| * | | | | | Speedup DiffNote#active? on discussions, preloading noteables and avoid touch...Paco Guzman2016-08-026-3/+40