summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed eslint test failureeslint-fixPhil Hughes2017-02-031-2/+2
* Merge branch 'Add-a-shash-command-for-target-merge-request-branch' into 'master'Sean McGivern2017-02-035-0/+123
|\
| * Adds /target_branch slash command functionality for merge requestsYarNayar2017-02-035-0/+123
* | Merge branch '27267-unnecessary-queries-from-projects-dashboard-atom-and-json...Sean McGivern2017-02-032-3/+5
|\ \
| * | Remove unnecessary queries for .atom and .json in Dashboard::ProjectsControll...Oswaldo Ferreira2017-02-032-3/+5
* | | Merge branch '25460-replace-word-users-with-members' into 'master' Clement Ho2017-02-033-5/+9
|\ \ \
| * | | adds changelog25460-replace-word-users-with-membersNur Rony2017-01-301-0/+4
| * | | replace words user(s) with member(s)Nur Rony2017-01-302-5/+5
| | |/ | |/|
* | | Merge branch '27332-mini-pipeline-graph-with-many-stages-has-no-line-spacing-...Annabel Dunstone Gray2017-02-032-1/+6
|\ \ \
| * | | Adjust pipeline graph height so they don't touch27332-mini-pipeline-graph-with-many-stages-has-no-line-spacing-in-firefox-and-safarisamrose32017-02-012-1/+6
* | | | Merge branch '17662-rename-builds' into 'master' Kamil TrzciƄski2017-02-0356-220/+224
|\ \ \ \
| * | | | Fix broken tests17662-rename-buildsFilipa Lacerda2017-02-0344-175/+175
| * | | | Adds changelog entryFilipa Lacerda2017-02-0312-26/+30
| * | | | Change "Build" to "Job" in builds show page header and sidebarFilipa Lacerda2017-02-037-19/+19
* | | | | Merge branch 'ref-switcher-perf' into 'master' Jacob Schatz2017-02-034-10/+34
|\ \ \ \ \
| * | | | | Fixed protected branches dropdownref-switcher-perfPhil Hughes2016-11-211-1/+1
| * | | | | Fixed up testsPhil Hughes2016-11-212-3/+4
| * | | | | Fixed the active branch selected indicatorPhil Hughes2016-11-211-1/+1
| * | | | | Changed how the data is returned - we only care about the branch/tag namePhil Hughes2016-11-212-4/+5
| * | | | | Uses take rather than KaminariPhil Hughes2016-11-211-2/+2
| * | | | | Use cloneNode instead of createElementPhil Hughes2016-11-211-5/+13
| * | | | | Improved ref switcher dropdown performancePhil Hughes2016-11-212-7/+21
* | | | | | Merge branch 'markdown-plantuml' into 'master' Sean McGivern2017-02-039-8/+115
|\ \ \ \ \ \
| * | | | | | PlantUML support for MarkdownHoracio Sanson2017-02-039-8/+115
* | | | | | | Merge branch 'squash' into 'master' Sean McGivern2017-02-0313-28/+75
|\ \ \ \ \ \ \
| * | | | | | | Backport changes from EE squashSean McGivern2017-02-0313-28/+75
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'fwn-to-find-by-full-path' into 'master' Dmitriy Zaporozhets2017-02-0322-32/+32
|\ \ \ \ \ \ \
| * | | | | | | replace `find_with_namespace` with `find_by_full_path`Adam Pahlevi2017-02-0322-32/+32
* | | | | | | | Merge branch '24606-force-password-reset-on-next-login' into 'master'Sean McGivern2017-02-034-0/+14
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Update api docs and minor changesGeorge Andrinopoulos2017-02-022-2/+4
| * | | | | | | Force new password after password reset via APIGeorge Andrinopoulos2017-02-023-0/+12
* | | | | | | | Merge branch 'update-installation-docs' into 'master' Stan Hu2017-02-032-0/+139
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Update installation docs to include Docker, othersupdate-installation-docsCindy Pallares2017-02-022-0/+139
* | | | | | | | Merge branch 'fix-git-hooks-when-creating-file' into 'master' Douwe Maan2017-02-0241-439/+906
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...fix-git-hooks-when-creating-fileLin Jen-Shin2017-02-02426-2058/+4651
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Make sure different project gets a merge requestLin Jen-Shin2017-01-261-2/+4
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-26157-284/+324
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Try to check if branch diverged explicitlyLin Jen-Shin2017-01-261-6/+13
| * | | | | | | | | | We don't care about the return value nowLin Jen-Shin2017-01-261-1/+1
| * | | | | | | | | | Make GitHooksService#execute return block valueLin Jen-Shin2017-01-262-8/+4
| * | | | | | | | | | Use commit rather than branch, and rename to avoid confusionLin Jen-Shin2017-01-261-8/+8
| * | | | | | | | | | @tree_edit_project is no longer usedLin Jen-Shin2017-01-261-4/+1
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-261415-9306/+37427
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix renamingLin Jen-Shin2017-01-076-9/+9
| * | | | | | | | | | | Rename from base to start because base could mean merge baseLin Jen-Shin2017-01-0611-91/+91
| * | | | | | | | | | | Detect if we really want a new merge request properlyLin Jen-Shin2017-01-061-2/+5
| * | | | | | | | | | | Properly fix the edge case!Lin Jen-Shin2017-01-061-2/+15
| * | | | | | | | | | | Rename source to base to avoid confusion from MRLin Jen-Shin2017-01-0611-91/+91
| * | | | | | | | | | | Don't set invalid @mr_source_branch when create_merge_request?Lin Jen-Shin2017-01-061-6/+3
| * | | | | | | | | | | Prefer leading dots over trailing dotsLin Jen-Shin2017-01-062-4/+4