summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Translate date ranges on contributors pagewinh-translate-contributors-page-datesWinnie Hellmann2017-12-152-8/+39
* Move dateTickFormat to separate moduleWinnie Hellmann2017-12-155-26/+94
* Add right padding to contributors graphWinnie Hellmann2017-12-151-1/+4
* Translate contributors graph x-axisWinnie Hellmann2017-12-151-2/+24
* Add createDateTimeFormat to format dates based on localeWinnie Hellmann2017-12-154-3/+75
* Merge branch 'gitaly-conflicts-prep' into 'master'Sean McGivern2017-12-153-34/+33
|\
| * Simplify conflict resolver interfacegitaly-conflicts-prepAlejandro Rodríguez2017-12-143-34/+33
* | Merge branch 'docs-update-documentation-guidelines' into 'master'🚄 Job van der Voort 🚀2017-12-152-83/+91
|\ \
| * | Docs update documentation guidelinesMarcia Ramos2017-12-152-83/+91
|/ /
* | Merge branch '38541-cancel-alignment' into 'master'Filipa Lacerda2017-12-152-6/+18
|\ \
| * | fix button alignment on MWPS component38541-cancel-alignmentSimon Knox2017-12-112-6/+18
* | | Merge branch '41016-import-gitlab-shell-projects' into 'master'Douwe Maan2017-12-158-128/+865
|\ \ \
| * | | Import gitlab_projects.rb from gitlab-shellNick Thomas2017-12-148-128/+865
* | | | Merge branch 'backport-ee-3706' into 'master'Dmitriy Zaporozhets2017-12-151-0/+4
|\ \ \ \
| * | | | Add eager-load paths to autoload paths to fix Rake tasksNick Thomas2017-12-141-0/+4
| |/ / /
* | | | Merge branch 'lfs-badge' into 'master'Douwe Maan2017-12-1511-1/+93
|\ \ \ \
| * | | | moved lfs_blob_ids method into ExtractsPath modulelfs-badgePhil Hughes2017-12-143-8/+6
| * | | | spec fixesPhil Hughes2017-12-143-4/+4
| * | | | moved lfs blob fetch from extractspath filePhil Hughes2017-12-145-6/+11
| * | | | added specsPhil Hughes2017-12-122-0/+68
| * | | | fixed failing testsPhil Hughes2017-12-112-0/+2
| * | | | fixed project homepage not having correct variablePhil Hughes2017-12-112-1/+3
| * | | | Added LFS badge to indicate LFS tracked filesPhil Hughes2017-12-115-0/+17
* | | | | Merge branch 'trigger-user-pipeline-info' into 'master'Grzegorz Bizon2017-12-151-4/+11
|\ \ \ \ \
| * | | | | Make rubocop happyBalasankar "Balu" C2017-12-151-1/+1
| * | | | | Use guard clauseBalasankar "Balu" C2017-12-151-3/+1
| * | | | | Improve languageBalasankar "Balu" C2017-12-151-4/+6
| * | | | | PrettifyBalasankar "Balu" C2017-12-151-4/+9
| * | | | | Use temp branchBalasankar "Balu" C2017-12-151-1/+1
| * | | | | Pass info about who started the job and which job triggered itBalasankar "Balu" C2017-12-151-1/+3
|/ / / / /
* | | | | Merge branch 'feature/migrate-merge-base-to-gitaly' into 'master'Robert Speicher2017-12-149-10/+30
|\ \ \ \ \
| * | | | | Migrate Gitlab::Git::Repository#merge_base_commit to Gitalyfeature/migrate-merge-base-to-gitalyAhmad Sherif2017-12-139-10/+30
* | | | | | Merge branch 'docs-add-indexes-monitoring' into 'master'Achilleas Pipinellis2017-12-146-82/+96
|\ \ \ \ \ \
| * | | | | | Docs: add indexes for monitoring and performance monitoringMarcia Ramos2017-12-146-82/+96
|/ / / / / /
* | | | | | Merge branch 'clearer-documentation-on-inline-diffs' into 'master'Achilleas Pipinellis2017-12-142-3/+25
|\ \ \ \ \ \
| * | | | | | clearer-documentation-on-inline-diffsDimitrie Hoekstra2017-12-142-3/+25
|/ / / / / /
* | | | | | Merge branch 'docs/commit-diff-discussions-in-mr-context' into 'master'Achilleas Pipinellis2017-12-144-0/+47
|\ \ \ \ \ \
| * | | | | | Add docs for commit diff discussion in merge requestsmicael.bergeron2017-12-144-0/+47
* | | | | | | Merge branch 'rc/update-flipper' into 'master'Robert Speicher2017-12-144-20/+32
|\ \ \ \ \ \ \
| * | | | | | | Update flipper to 0.11.0 and take advantage of the new featuresrc/update-flipperRémy Coutable2017-12-144-20/+32
* | | | | | | | Merge branch 'ph-es-modules' into 'master'Filipa Lacerda2017-12-1410-121/+67
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Converted JS modules into exported modulesph-es-modulesPhil Hughes2017-12-1410-121/+67
* | | | | | | | Merge branch 'docs-jprovazn-create-from-email' into 'master'Marcia Ramos2017-12-143-5/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed doc for create MR from emaildocs-jprovazn-create-from-emailJan Provaznik2017-12-123-5/+12
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'dm-batchloader-project' into 'master'Sean McGivern2017-12-142-3/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Clear BatchLoader after each spec to prevent holding onto records longer than...dm-batchloader-projectDouwe Maan2017-12-141-0/+5
| * | | | | | | | Include project in BatchLoader key to prevent returning blobs for the wrong p...Douwe Maan2017-12-141-3/+9
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch '40509_sorting_tags_api' into 'master'Rémy Coutable2017-12-146-5/+65
|\ \ \ \ \ \ \ \
| * | | | | | | | sorting for tags apihaseeb2017-12-146-5/+65
|/ / / / / / / /
* | | | | | | | Merge branch 'zj-mr-diff-memoization-bug' into 'master'Sean McGivern2017-12-143-14/+25
|\ \ \ \ \ \ \ \