summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into jej-pages-picked-from-eeJames Edwards-Jones2017-02-03119-549/+975
|\
| * Merge branch '27267-unnecessary-queries-from-projects-dashboard-atom-and-json...Sean McGivern2017-02-031-3/+1
| |\
| | * Remove unnecessary queries for .atom and .json in Dashboard::ProjectsControll...Oswaldo Ferreira2017-02-031-3/+1
| * | Merge branch '25460-replace-word-users-with-members' into 'master' Clement Ho2017-02-032-5/+5
| |\ \
| | * | 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-031-1/+2
| |\ \ \
| | * | | Adjust pipeline graph height so they don't touch27332-mini-pipeline-graph-with-many-stages-has-no-line-spacing-in-firefox-and-safarisamrose32017-02-011-1/+2
| * | | | Merge branch '17662-rename-builds' into 'master' Kamil TrzciƄski2017-02-0341-89/+89
| |\ \ \ \
| | * | | | Fix broken tests17662-rename-buildsFilipa Lacerda2017-02-0330-44/+44
| | * | | | Adds changelog entryFilipa Lacerda2017-02-0311-26/+26
| | * | | | 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-033-8/+31
| |\ \ \ \ \
| | * | | | | Fixed protected branches dropdownref-switcher-perfPhil Hughes2016-11-211-1/+1
| | * | | | | Fixed up testsPhil Hughes2016-11-211-1/+1
| | * | | | | 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 'squash' into 'master' Sean McGivern2017-02-039-22/+58
| |\ \ \ \ \ \
| | * | | | | | Backport changes from EE squashSean McGivern2017-02-039-22/+58
| | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'fwn-to-find-by-full-path' into 'master' Dmitriy Zaporozhets2017-02-038-12/+8
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | replace `find_with_namespace` with `find_by_full_path`Adam Pahlevi2017-02-038-12/+8
| * | | | | | Merge branch 'fix-git-hooks-when-creating-file' into 'master' Douwe Maan2017-02-0220-321/+626
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...fix-git-hooks-when-creating-fileLin Jen-Shin2017-02-02121-508/+871
| | |\ \ \ \ \ \
| | * | | | | | | 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-263-9/+9
| | |\ \ \ \ \ \ \
| | * | | | | | | | Try to check if branch diverged explicitlyLin Jen-Shin2017-01-261-6/+13
| | * | | | | | | | 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-26606-3259/+9044
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | 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
| | * | | | | | | | | Fix for initial commit and remove unneeded argsLin Jen-Shin2017-01-062-5/+18
| | * | | | | | | | | Just trust set_commit_variables to set everything!Lin Jen-Shin2017-01-063-9/+6
| | * | | | | | | | | Prefer leading dots over trailing dotsLin Jen-Shin2017-01-052-6/+6
| | * | | | | | | | | Merge request terms are reversed for GitOperationServiceLin Jen-Shin2017-01-051-4/+4
| | * | | | | | | | | I think I am really confused, should be @tree_edit_projectLin Jen-Shin2017-01-051-1/+1
| | * | | | | | | | | Remove tag with git hooksLin Jen-Shin2017-01-053-10/+23
| | * | | | | | | | | Introduce Repository#with_repo_branch_commitLin Jen-Shin2017-01-053-33/+28
| | * | | | | | | | | Indent the way rubocop likesLin Jen-Shin2017-01-053-5/+5
| | * | | | | | | | | Update the comment:Lin Jen-Shin2017-01-041-3/+5
| | * | | | | | | | | Prefer leading dots over trailing dotsLin Jen-Shin2017-01-041-2/+2
| | * | | | | | | | | Add a comment to explain why newrev should be updatedLin Jen-Shin2017-01-041-1/+3
| | * | | | | | | | | Merge branch 'master' into fix-git-hooks-when-creating-fileLin Jen-Shin2017-01-04733-3747/+6935
| | |\ \ \ \ \ \ \ \ \