summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Exclude projects pending delete from notificationspending-delete-project-notificationsSean McGivern2016-07-071-1/+8
* Fix invite user feature test and improve request member UI rowDmitriy Zaporozhets2016-07-071-1/+1
* Improve UI for member row on project/group members pagesDmitriy Zaporozhets2016-07-072-45/+53
* Add data when member joined a teamValery Sizov2016-07-071-0/+4
* Merge branch 'services_refactoring1' into 'master' Dmitriy Zaporozhets2016-07-0718-43/+37
|\
| * Services: code style fixes, minor refactoringservices_refactoring1Valery Sizov2016-07-0618-43/+37
* | Merge branch 'show_push_widget_in_upstream' into 'master' Rémy Coutable2016-07-072-2/+8
|\ \
| * | Show last push widget in upstream after push to forkDrew Blessing2016-07-062-2/+8
* | | Merge branch 'patch-3' into 'master' Rémy Coutable2016-07-071-14/+14
|\ \ \
| * | | Allow everyone to sort tags, not only those who has accessSerg2016-07-061-14/+14
| |/ /
* | | Merge branch 'build-auto-refresh' into 'master' Jacob Schatz2016-07-062-5/+5
|\ \ \
| * | | Fixed issue with build auto-refresh not workingbuild-auto-refreshPhil Hughes2016-07-062-5/+5
| | |/ | |/|
* | | Merge branch '18283-pluralize-stage-headings' into 'master' Jacob Schatz2016-07-062-2/+2
|\ \ \
| * | | Get rid of pluralize on stage namesAnnabel Dunstone2016-07-062-2/+2
* | | | Merge branch '18858-options-dropdown-on-mobile-should-be-full-width' into 'ma...Jacob Schatz2016-07-061-0/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | Added 100% width to open dropdown menus on mobile18858-options-dropdown-on-mobile-should-be-full-widthLuke "Jared" Bennett2016-06-221-0/+3
* | | | Merge branch 'escape-to-cancel-note' into 'master' Jacob Schatz2016-07-061-9/+39
|\ \ \ \ | |_|/ / |/| | |
| * | | Use switch/when statementescape-to-cancel-noteDouwe Maan2016-07-051-21/+24
| * | | Double to single quotesDouwe Maan2016-07-041-1/+1
| * | | Add confirmation when canceling creating/editing with changesDouwe Maan2016-07-041-0/+12
| * | | Cancel creating or editing note by hitting EscapeDouwe Maan2016-07-041-5/+20
* | | | Merge branch '15094-throttling-pushes_since_gc' into 'master' Douwe Maan2016-07-061-2/+8
|\ \ \ \
| * | | | Throttle the update of `project.pushes_since_gc` to 1 minute15094-throttling-pushes_since_gcPaco Guzman2016-07-051-2/+8
* | | | | Merge branch '19092-fix-event-for-legacydiffnote-not-considered-note' into 'm...Douwe Maan2016-07-061-2/+2
|\ \ \ \ \
| * | | | | Use a more future-proof check for Note/LegacyDiffNote19092-fix-event-for-legacydiffnote-not-considered-noteRémy Coutable2016-07-061-1/+1
| * | | | | Fix diff comments not showing up in activity feedRémy Coutable2016-07-041-2/+2
* | | | | | Merge branch 'gh-labels' into 'master' Robert Speicher2016-07-064-13/+16
|\ \ \ \ \ \
| * | | | | | Fix unescaped strings in the labels dropdown templategh-labelsDouglas Barbosa Alexandre2016-07-061-2/+2
| * | | | | | Render label name contains ?, & in the labels dropdown without escapingDouglas Barbosa Alexandre2016-07-052-6/+5
| * | | | | | Use CGI.unescapeHTML rather than doing the gsub with a mapDouglas Barbosa Alexandre2016-07-051-11/+1
| * | | | | | Move `unescape_html_entities` from LabelsHelper to Label modelDouglas Barbosa Alexandre2016-07-052-12/+12
| * | | | | | Render references for labels that name contains ?, or &Douglas Barbosa Alexandre2016-07-053-15/+15
| * | | | | | Allow '?', or '&' for label titlesDouglas Barbosa Alexandre2016-07-052-5/+19
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'fix/import-url-validator' into 'master' Robert Speicher2016-07-062-3/+48
|\ \ \ \ \ \
| * | | | | | refactor url validator to use sanitizer for checkfix/import-url-validatorJames Lopez2016-07-011-3/+1
| * | | | | | few more changes from suggestionsJames Lopez2016-06-301-1/+0
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-url-...James Lopez2016-06-30103-319/+625
| |\ \ \ \ \ \
| * | | | | | | few changes based on feedbackJames Lopez2016-06-302-10/+7
| * | | | | | | fix merge conflictsJames Lopez2016-06-2886-356/+450
| |\ \ \ \ \ \ \
| * | | | | | | | added more info on how addressable URI differs from what we use in UrlValidatorJames Lopez2016-06-241-1/+3
| * | | | | | | | updated validator based on feedbackJames Lopez2016-06-231-3/+3
| * | | | | | | | another fix and fixed specJames Lopez2016-06-221-0/+2
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-url-...James Lopez2016-06-22132-732/+1200
| |\ \ \ \ \ \ \ \
| * | | | | | | | | fix commentJames Lopez2016-06-201-1/+1
| * | | | | | | | | fixed a few MySQL issues and added changelogJames Lopez2016-06-201-3/+3
| * | | | | | | | | started working on a migration for projects that have current import_url issuesJames Lopez2016-06-201-7/+7
| * | | | | | | | | fix addressable url validatorJames Lopez2016-06-201-7/+7
| * | | | | | | | | Merge branches 'fix/import-url-validator' and 'master' of gitlab.com:gitlab-o...James Lopez2016-06-20132-594/+1679
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | fixing URL validation for import_url on projectsJames Lopez2016-06-172-3/+50
* | | | | | | | | | | Merge branch 'fix/project-export-error' into 'master' Rémy Coutable2016-07-061-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |