summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove max-width from commentsnotes-inputAnnabel Dunstone2016-04-122-14/+0
* Input updatesAnnabel Dunstone2016-04-123-5/+49
* Wrap text in notes box if longer than code in diffAnnabel Dunstone2016-04-121-0/+1
* Merge branch 'rs-update-spring' into 'master' Robert Speicher2016-04-122-6/+6
|\
| * Update spring and spring-commands-spinachrs-update-springRobert Speicher2016-04-122-6/+6
* | Merge branch 'issue_14206' into 'master' Jacob Schatz2016-04-126-7/+160
|\ \
| * \ Merge branch 'master' into issue_14206issue_14206Alfredo Sumaran2016-04-11214-943/+2578
| |\ \
| * | | Rename method and initialize .timeago insideAlfredo Sumaran2016-04-114-19/+10
| * | | Update datetime in .timeago elementsAlfredo Sumaran2016-04-073-6/+28
| * | | Add datetime_utility.js.coffeeAlfredo Sumaran2016-04-071-0/+15
| * | | Add date.format.jsAlfredo Sumaran2016-04-071-0/+125
| * | | Convert time param to TimeAlfredo Sumaran2016-04-071-1/+1
* | | | Merge branch 'check-import-job-status' into 'master' Robert Speicher2016-04-121-2/+8
|\ \ \ \ | |_|_|/ |/| | |
| * | | Check and report import job status to help diagnose issues with forkingStan Hu2016-04-111-2/+8
* | | | Merge branch 'project-title-dropdown' into 'master' Jacob Schatz2016-04-1210-37/+82
|\ \ \ \
| * | | | Updated CHANGELOGPhil Hughes2016-04-121-9/+1
| * | | | Updated based on Ruby feedbackPhil Hughes2016-04-122-1/+9
| * | | | Updated RubyPhil Hughes2016-04-122-3/+7
| * | | | Updated based on Ruby feedbackPhil Hughes2016-04-123-19/+21
| * | | | Tests updatePhil Hughes2016-04-122-22/+24
| * | | | Updated testsPhil Hughes2016-04-123-4/+3
| * | | | Project dropdown in header uses new dropdownPhil Hughes2016-04-126-13/+51
* | | | | Merge branch 'fix_emojis_not_showing_in_autocomplete' into 'master' Robert Speicher2016-04-122-2/+2498
|\ \ \ \ \
| * | | | | fix emoji aliases not showing in autocompletefix_emojis_not_showing_in_autocompleteArinde Eniola2016-04-092-2/+2498
* | | | | | Merge branch 'member-access-note-row' into 'master' Jacob Schatz2016-04-121-6/+6
|\ \ \ \ \ \
| * | | | | | Fixed issue with member access not being visible on notesmember-access-note-rowPhil Hughes2016-04-081-6/+6
* | | | | | | Merge branch 'fix_quick_submit_missing_in_edit_merge_request' into 'master' Jacob Schatz2016-04-122-1/+22
|\ \ \ \ \ \ \
| * | | | | | | add some changes to the testfix_quick_submit_missing_in_edit_merge_requestArinde Eniola2016-04-071-11/+5
| * | | | | | | add testArinde Eniola2016-04-071-0/+27
| * | | | | | | fix quick submit missing in edit merge request pageArinde Eniola2016-04-071-1/+1
* | | | | | | | Merge branch 'admin-pages-layout-sass-update' into 'master' Jacob Schatz2016-04-121-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Updated meqia query for admin/groups search boxadmin-pages-layout-sass-updatePhil Hughes2016-04-071-3/+3
* | | | | | | | | Merge branch 'right-sidebar-link-hover' into 'master' Jacob Schatz2016-04-121-0/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Fixed colour of dropdown link hoverright-sidebar-link-hoverPhil Hughes2016-04-071-0/+6
| |/ / / / / / /
* | | | | | | | Merge branch 'fix_labels_not_showing_in_todos' into 'master' Jacob Schatz2016-04-123-1/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | fix labels not showing on todos pagefix_labels_not_showing_in_todosArinde Eniola2016-04-063-1/+16
* | | | | | | | | Merge branch 'decouple-member-notification' into 'master' Douwe Maan2016-04-1237-338/+447
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix specs for Projects::NotificationSettingsControllerDouglas Barbosa Alexandre2016-04-121-28/+0
| * | | | | | | | | Improve specs for group/project notification controllerdecouple-member-notificationDouglas Barbosa Alexandre2016-04-122-3/+53
| * | | | | | | | | Simplify Projects::NotificationSettingsControllerDouglas Barbosa Alexandre2016-04-123-9/+2
| * | | | | | | | | Fix partial for update project notificationsDouglas Barbosa Alexandre2016-04-111-1/+1
| * | | | | | | | | Requires user to be signed in when changing notification settingsDouglas Barbosa Alexandre2016-04-114-0/+52
| * | | | | | | | | Reuse `User#notification_settings_for` when it's possibleDouglas Barbosa Alexandre2016-04-115-10/+9
| * | | | | | | | | Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-11119-588/+1169
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use Hash instead of Array on NotificationSetting#level enumDouglas Barbosa Alexandre2016-04-111-3/+1
| * | | | | | | | | | Fix schema.rbDouglas Barbosa Alexandre2016-04-081-4/+4
| * | | | | | | | | | Fix CHANGELOGDouglas Barbosa Alexandre2016-04-081-4/+0
| * | | | | | | | | | Update gitlab-shell to 2.7.2Yorick Peterse2016-04-081-1/+1
| * | | | | | | | | | Add method to return the user notification setting for a group, or a projectDouglas Barbosa Alexandre2016-04-082-1/+5
| * | | | | | | | | | Use default_value_for to set default NotificationSetting#levelDouglas Barbosa Alexandre2016-04-082-9/+6