summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* #34945: add a div id to the readme section in the project overviewRiccardo Padovani2017-09-072-3/+4
* Merge branch '37349-remove-extra-top-margin-search-dropdown' into 'master'Annabel Dunstone Gray2017-09-071-1/+1
|\
| * Fix spacing between nav and dropdown to be consistent with other dropdowns37349-remove-extra-top-margin-search-dropdownkushalpandya2017-09-061-1/+1
* | Merge branch 'ee_issue_928_backport' into 'master'Sean McGivern2017-09-0756-434/+618
|\ \
| * | Fix failing specee_issue_928_backportFelipe Artur2017-09-061-1/+1
| * | Finish backports and fix specsFelipe Artur2017-09-063-4/+14
| * | api js changes not needed for CESimon Knox2017-09-061-10/+2
| * | pick some missing JSSimon Knox2017-09-062-3/+5
| * | backport scss for group boardsSimon Knox2017-09-062-44/+21
| * | missing js changeSimon Knox2017-09-061-10/+10
| * | backport haml changesSimon Knox2017-09-069-42/+50
| * | move templates from projects to sharedSimon Knox2017-09-0612-9/+11
| * | FE backport of group boards to reduce CE conflictsSimon Knox2017-09-0611-52/+94
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ee_issue_928_ba...Simon Knox2017-09-06343-1902/+6924
| |\ \
| * | | Fix route conflictFelipe Artur2017-09-041-2/+2
| * | | Fix specs BACKPORTFelipe Artur2017-09-041-1/+1
| * | | Small fixesFelipe Artur2017-08-315-4/+11
| * | | Continue BE backportFelipe Artur2017-08-3110-6/+51
| * | | Group boards CE backportFelipe Artur2017-08-2824-267/+366
* | | | Merge branch 'fix-stray-or-in-project-create-ui' into 'master'Rémy Coutable2017-09-071-2/+2
|\ \ \ \
| * | | | Fix stray OR in New Project pageRobin Bobbitt2017-09-061-2/+2
* | | | | Merge branch 'fly-out-top-level-item' into 'master'Filipa Lacerda2017-09-077-13/+234
|\ \ \ \ \
| * | | | | Add top level items to fly-out navigationPhil Hughes2017-09-067-13/+234
* | | | | | Merge branch 'breadcrumbs-extra-btns-remove' into 'master'Filipa Lacerda2017-09-0718-94/+23
|\ \ \ \ \ \
| * | | | | | fixed new milstone button not being visiblePhil Hughes2017-09-061-1/+1
| * | | | | | fixed breadcrumb containerPhil Hughes2017-09-061-1/+1
| * | | | | | Moves the action buttons out of the breadcrumbsPhil Hughes2017-09-0618-92/+21
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'rs-remove-usage-ping-pretty' into 'master'Sean McGivern2017-09-072-3/+2
|\ \ \ \ \ \
| * | | | | | Remove the `pretty` parameter for `usage_data`rs-remove-usage-ping-prettyRobert Speicher2017-09-062-3/+2
* | | | | | | Merge branch 'gitaly-tree-entries-fix' into 'master'Rémy Coutable2017-09-072-2/+4
|\ \ \ \ \ \ \
| * | | | | | | Implement fix for n+1 issue on `flatten_tree` helpergitaly-tree-entries-fixAlejandro Rodríguez2017-09-062-2/+4
| | |_|_|/ / / | |/| | | | |
* | | | | | | Fix mr tabs positionAnnabel Dunstone Gray2017-09-073-8/+16
* | | | | | | Merge branch '37023-remove-focus-styles-from-dropdown-empty-link' into 'master'Tim Zallmann2017-09-075-14/+22
|\ \ \ \ \ \ \
| * | | | | | | Remove focus styles from dropdown empty link37023-remove-focus-styles-from-dropdown-empty-linkEric Eastwood2017-09-055-14/+22
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'add_quick_submission_on_user_settings_page' into 'master'Tim Zallmann2017-09-071-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Add quick submission on user settings pageVitaliy @blackst0ne Klachkov2017-09-021-1/+1
* | | | | | | Merge branch '35811-fix-copy-link-text-color' into 'master'Tim Zallmann2017-09-061-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Prevent `btn-transparent` class from being added on `Copy link` actionkushalpandya2017-09-061-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'fix/sm/33281-activerecord-recordinvalid-when-build-has-nil-prot...Kamil Trzciński2017-09-062-2/+0
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Remove only validationfix/sm/33281-activerecord-recordinvalid-when-build-has-nil-protectedShinya Maeda2017-09-072-2/+0
| * | | | | | Revert set_protectedShinya Maeda2017-09-073-11/+4
| * | | | | | Fix /models/ci/pipeline.rbShinya Maeda2017-09-061-1/+1
| * | | | | | Use before_save :set_protectedShinya Maeda2017-09-063-4/+11
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'ie-sidebar-icon-size' into 'master'Annabel Dunstone Gray2017-09-061-0/+4
|\ \ \ \ \ \
| * | | | | | Fixed sidebar icon size in ie11ie-sidebar-icon-sizePhil Hughes2017-09-061-0/+4
* | | | | | | Merge branch '34509-improves-markdown-rendering-performance-for-commits-list'...Douwe Maan2017-09-0616-26/+61
|\ \ \ \ \ \ \
| * | | | | | | Adds cacheless render to Banzai object render34509-improves-markdown-rendering-performance-for-commits-listTiago Botelho2017-09-0617-33/+61
| * | | | | | | Adds CommitDescriptionRendererTiago Botelho2017-09-061-0/+7
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch '35161_first_time_contributor_badge' into 'master'Sean McGivern2017-09-0615-19/+93
|\ \ \ \ \ \ \
| * | | | | | | fixup whitespacemicael.bergeron2017-09-061-1/+1