summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* kill the nowrap optionhttp://jneen.net/2016-07-141-2/+3
* rm dead `highlighter` methodhttp://jneen.net/2016-07-141-4/+0
* Merge branch 'fix/persistent-import-data' into 'master' Fatih Acet2016-07-144-5/+16
|\
| * udpated JS based on feedbackfix/persistent-import-dataJames Lopez2016-07-141-5/+2
| * some JS magic to fix empty URL bugJames Lopez2016-07-132-2/+10
| * updated create_or_update_import_data to use guard clauseJames Lopez2016-07-131-1/+3
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/persistent-...James Lopez2016-07-1363-268/+484
| |\
| * | fix more specsJames Lopez2016-07-131-1/+5
| * | fix specsJames Lopez2016-07-131-1/+1
| * | fixes a few issues to do with import_url not being saved correctly for import...James Lopez2016-07-122-3/+3
* | | Merge branch 'project-files-header-cursor' into 'master' Fatih Acet2016-07-141-2/+1
|\ \ \
| * | | Use default cursor for table header of project files (!5165)winniehell2016-07-141-2/+1
* | | | Merge branch 'lbennett/gitlab-ce-18120-focus-filter-shortcut' into 'master' Fatih Acet2016-07-144-12/+20
|\ \ \ \ | |/ / / |/| | |
| * | | Review changeslbennett/gitlab-ce-18120-focus-filter-shortcutLuke "Jared" Bennett2016-07-112-8/+9
| * | | Added shortcut to focus all search tags apart from the top nav searchLuke "Jared" Bennett2016-07-114-9/+16
* | | | Merge branch 'top-links-label' into 'master' Fatih Acet2016-07-142-10/+10
|\ \ \ \
| * | | | Aria labels on top header linkstop-links-labelPhil Hughes2016-07-122-10/+10
* | | | | Merge branch 'issuable-author-tooltip' into 'master' Fatih Acet2016-07-142-3/+4
|\ \ \ \ \
| * | | | | Fixed Rubocopissuable-author-tooltipPhil Hughes2016-07-131-2/+1
| * | | | | Added author username tooltip in issuable headerPhil Hughes2016-07-122-3/+5
* | | | | | Improves left static sidebar behaviourDmitriy Zaporozhets2016-07-143-7/+4
* | | | | | Merge branch 'fix-label-reference-filter' into 'master' Robert Speicher2016-07-131-3/+6
|\ \ \ \ \ \
| * | | | | | Simplify regex for string-based multi-word label surrounded in quotesfix-label-reference-filterDouglas Barbosa Alexandre2016-07-131-1/+1
| * | | | | | Doesn't match empty label references surrounded in quotesDouglas Barbosa Alexandre2016-07-131-1/+1
| * | | | | | Fix markdown rendering for label references that contains `.`Douglas Barbosa Alexandre2016-07-131-2/+2
| * | | | | | Fix markdown rendering for label references that begin with a digitDouglas Barbosa Alexandre2016-07-131-1/+4
| * | | | | | Fix markdown rendering for consecutive label referencesDouglas Barbosa Alexandre2016-07-131-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Revert "Merge branch '18193-developers-can-merge' into 'master' "Robert Speicher2016-07-1315-47/+20
* | | | | | Merge branch 'dropdown-load-fix' into 'master' Douwe Maan2016-07-131-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | removes redundant filter_branches filetiagonbotelho2016-07-121-8/+0
| * | | | | fixes test for simplified version of projecttiagonbotelho2016-07-121-0/+8
| * | | | | adds test to check json fields on simple request and changes the url request ...tiagonbotelho2016-07-121-1/+0
| * | | | | fixes missing field on basicprojectdetailstiagonbotelho2016-07-121-0/+1
| * | | | | removes debugging printtiagonbotelho2016-07-121-1/+0
| * | | | | gets the new object through /simple endpoint and renders on the dropdowntiagonbotelho2016-07-121-0/+1
| * | | | | adds test to check json fields on simple request and changes the url request ...tiagonbotelho2016-07-122-2/+1
| * | | | | fixes missing field on basicprojectdetailstiagonbotelho2016-07-121-0/+1
| * | | | | changes the usage of simpleprojectdetails to already implemented basicproject...tiagonbotelho2016-07-121-1/+1
| * | | | | removes debugging printtiagonbotelho2016-07-121-1/+0
| * | | | | gets the new object through /simple endpoint and renders on the dropdowntiagonbotelho2016-07-122-1/+2
| |/ / / /
* | | | | Implement last round of review comments from !4892.18193-developers-can-mergeTimothy Andrew2016-07-131-2/+2
* | | | | Move all "checks" under `GitLab::Checks`.Timothy Andrew2016-07-131-1/+1
* | | | | Don't ask the user to "merge this request manually".Timothy Andrew2016-07-132-1/+6
* | | | | Clean up `protected_branches.js.coffee`Timothy Andrew2016-07-131-6/+3
* | | | | Refactor `Gitlab::GitAccess`Timothy Andrew2016-07-134-5/+5
* | | | | Enforce "developers can merge" during `pre-receive`.Timothy Andrew2016-07-132-7/+11
* | | | | Added "developers can merge" setting to protected branchesMathias Vestergaard2016-07-138-6/+27
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-07-1323-131/+290
|\ \ \ \ \
| * \ \ \ \ Merge branch '19693-emoji-awards-aren-t-deleted-for-deleted-users' into 'mast...Douwe Maan2016-07-121-1/+1
| |\ \ \ \ \
| | * | | | | Delete award emoji when deleting a user19693-emoji-awards-aren-t-deleted-for-deleted-usersSean McGivern2016-07-121-1/+1