summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* created editor library to manage all things editormulti-file-editor-dirty-diff-indicatorPhil Hughes2017-11-178-77/+344
* Multi-file editor dirty diff indicatorPhil Hughes2017-11-162-6/+64
* Merge branch 'limit_ee_conflicts-gitlab-svgs' into 'master'Sean McGivern2017-11-141-0/+6
|\
| * Update limit_ee_conflicts.md with assets/gitlab-svgs conflict resolution.limit_ee_conflicts-gitlab-svgsLuke "Jared" Bennett2017-11-131-0/+6
* | Merge branch '38869-project' into 'master'Phil Hughes2017-11-145-164/+142
|\ \
| * | Export project, projectAvatar and projectImport as ES6 modules38869-projectFilipa Lacerda2017-11-135-164/+142
* | | Merge branch 'gitaly-wiki-get-all-pages' into 'master'Rémy Coutable2017-11-147-23/+155
|\ \ \
| * | | Incorporate Gitaly's WikiService.WikiGetAllPages RPCgitaly-wiki-get-all-pagesAlejandro Rodríguez2017-11-137-23/+111
| * | | Add spec examples for Gitlab::Gitaly::WikiServiceAlejandro Rodríguez2017-11-131-0/+44
* | | | Merge branch 'bvl-refresh-member-listing-on-removal' into 'master'Tim Zallmann2017-11-135-14/+26
|\ \ \ \
| * | | | Don't perform a JS request when deleting a membership.bvl-refresh-member-listing-on-removalBob Van Landuyt2017-11-135-14/+26
* | | | | Merge branch '3615-improve-welcome-screen' into 'master'Tim Zallmann2017-11-137-102/+169
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Use flexbox instead of bootstrap columns3615-improve-welcome-screenAnnabel Dunstone Gray2017-11-084-86/+97
| * | | | Add new icon; update contentAnnabel Dunstone Gray2017-11-083-3/+4
| * | | | Add four blocks to each welcome pageAnnabel Dunstone Gray2017-11-082-10/+28
| * | | | Update new project iconAnnabel Dunstone Gray2017-11-081-1/+1
| * | | | Add mobile stylesAnnabel Dunstone Gray2017-11-081-4/+15
| * | | | Reorganize landing page for new usersAnnabel Dunstone Gray2017-11-085-94/+120
* | | | | Merge branch '37174-wrong-case-for-roles-header-in-allowed-to-create-project-...Annabel Dunstone Gray2017-11-131-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add missing CSS class to capitalize the protectec tag header dropdown37174-wrong-case-for-roles-header-in-allowed-to-create-project-settings-dropdownJose Ivan Vargas2017-11-101-1/+1
* | | | | Merge branch '40068-runner-sorting-regression' into 'master'Annabel Dunstone Gray2017-11-132-1/+6
|\ \ \ \ \
| * | | | | Revert a regression on runners sorting (!15134)Takuya Noguchi2017-11-122-1/+6
* | | | | | Merge branch '39436-pages-api-administrative' into 'master'Rémy Coutable2017-11-1311-23/+172
|\ \ \ \ \ \
| * | | | | | Add administrative endpoint to list all pages domainsTravis Miller2017-11-1311-23/+172
|/ / / / / /
* | | | | | Merge branch '38605-move-ee_compat_check-to-an-earlier-build-stage' into 'mas...Sean McGivern2017-11-131-5/+1
|\ \ \ \ \ \
| * | | | | | Remove the custom cache definition for the ee_compat_check job and disallow i...38605-move-ee_compat_check-to-an-earlier-build-stageRémy Coutable2017-11-101-5/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'issue_39238' into 'master'Sean McGivern2017-11-133-4/+32
|\ \ \ \ \ \
| * | | | | | Fix image diff notes emailFelipe Artur2017-11-133-4/+32
* | | | | | | Merge branch '39842-fetch-ivar' into 'master'Rémy Coutable2017-11-134-6/+93
|\ \ \ \ \ \ \
| * | | | | | | Add Gitlab::Utils::StrongMemoizeLin Jen-Shin (godfat)2017-11-134-6/+93
|/ / / / / / /
* | | | | | | Merge branch 'fix-subgroup-autocomplete' into 'master'Rémy Coutable2017-11-133-1/+21
|\ \ \ \ \ \ \
| * | | | | | | Fix users autocomplete in a subgroupSean McGivern2017-11-133-1/+21
* | | | | | | | Merge branch '38075_allow_refernce_integer_labels' into 'master'Filipa Lacerda2017-11-134-10/+38
|\ \ \ \ \ \ \ \
| * | | | | | | | fix to allow integer label refernceshaseeb2017-11-134-10/+38
|/ / / / / / / /
* | | | | | | | Merge branch '39602-move-update-project-counter-caches-out-of-issues-merge-re...Rémy Coutable2017-11-137-39/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Move update_project_counter_caches? out of issue and merge requestGeorge Andrinopoulos2017-11-117-39/+14
* | | | | | | | | Merge branch 'dm-authorize-admin-oauth-application' into 'master'Sean McGivern2017-11-132-5/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Prevent error when authorizing an admin-created OAauth application without a ...Douwe Maan2017-11-132-5/+14
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '39335-add-time-spend-to-milestones' into 'master'Sean McGivern2017-11-136-0/+76
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add externalized stringsGeorge Andrinopoulos2017-11-112-4/+4
| * | | | | | | | | Add feature test to milestoneGeorge Andrinopoulos2017-11-112-0/+35
| * | | | | | | | | Move total time spend calculation to milestoneishGeorge Andrinopoulos2017-11-117-77/+24
| * | | | | | | | | Fix static code analysis offenceGeorge Andrinopoulos2017-11-111-1/+1
| * | | | | | | | | Fix collapsed sidebar messages and iconGeorge Andrinopoulos2017-11-115-6/+18
| * | | | | | | | | Add total time spent to milestonesGeorge Andrinopoulos2017-11-115-0/+82
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'multi-editor-store-specs' into 'master'Filipa Lacerda2017-11-1313-11/+1907
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | added missing specsmulti-editor-store-specsPhil Hughes2017-11-102-1/+212
| * | | | | | | | | fixed specsPhil Hughes2017-11-102-39/+13
| * | | | | | | | | file action specsPhil Hughes2017-11-101-1/+349
| * | | | | | | | | file action specsPhil Hughes2017-11-101-0/+44